Bug in External Programs (merge)? SOS 4.1.1 Linux

If you are having a problem using SourceOffSite, post a message here.

Moderator: SourceGear

Post Reply
johnb

Bug in External Programs (merge)? SOS 4.1.1 Linux

Post by johnb » Tue Sep 13, 2005 1:56 pm

We're using SOS ""classic" Professional Edition, version 4.1.1.

The "%s" placeholder argument does not seem to get expanded for the external application for merging files.

To duplicate, select Tools / Options, then select the "External Programs" tab.
Fill in the field for "Application for merging files:" with the following...
<pre> /bin/echo ' A ' %s ' B ' %s ' C ' %s ' D ' %s > ~/foo.txt </pre>
(Use whatever path your echo command is located.)
It is filling in the filenames at the end of the command tail and not expanding the '%s' arguments.

Is this fixed in 4.1.2?

Also, the merge command line REALLY needs a different flag than %s !!
It looks like SOS is putting out the filenames in {targetfile, basefile, sosfile} order. Some tools (kdiff3) want them in a different order.
So it really needs flags that specify which file (unlike a simple 2 way diff).
I suggest %b, %t, and %c (for Basefile, Targetfile, and Comparefile).

Thanks!
-- johnb

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Post by lbauer » Wed Sep 14, 2005 8:12 am

We didn't make any changes to this in 4.1.2.

I'll log a feature request to use different flags for merge.

We've done some testing and have found that with some merge tools, like Meld, there is no need to specify any flags. You only need to configure the path to the merge executable, or the name, if it's already in your path.

Thanks for your comments and suggestions.
Linda Bauer
SourceGear
Technical Support Manager

Post Reply