two improvements to mercurial

[Thomas Arendsen Hein]

* Jordan Breeding <jordan.breeding at mac.com> [20050830 06:32]:
> I am attaching a rudimentary patch to add support for using FileMerge  
> only on Darwin and only when FileMerge exists in its default  
> location.  I tried looking at kdiff3 and at least for my uses they  
> seem similar, so I prefer to use FileMerge since I have used it a  
> little before.
> 
> Sorry, I don't know what type of inlining or attaching the mercurial  
> mailing list normally uses, so I will just hope that Mail.app gets my  
> attachment to you in a useable format.

It wasn't in a generally usable format, but with the help from
another mutt user on this list I was already prepared :)

> +if [ "$(uname -s)" == "Darwin" -a -f /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge ]; then
> +    /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge -left "$LOCAL" -right "$OTHER" -ancestor "$BASE" -merge "$LOCAL" || exit 1
> +    exit 0

Is there a FileMerge at the same location on non-Darwin systems? If
not, you don't need the uname check, which isn't sh syntax anyway.

Bryan's further comments still apply. hgmerge is intended to be
changed by the user, so feel free to do it locally and document this
in the Wiki for others.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/