git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Feb 27, 2011, 10:37 UTC
Message-ID
<AANLkTi=CuyNLNuuootcd8_H9Zh=WqAwiS+S6PJjPAfcw@mail.gmail.com>
In-Reply-To
<4D69E628.5040007@gmail.com>
On Sun, Feb 27, 2011 at 06:50, Chris Packham <judge.packham@gmail.com> wrote:
Show 14 quoted lines
>> +     ecmerge)
>> +             echo guimerge
>> +             ;;
>>       emerge)
>>               echo emacs
>>               ;;
>
> I think this is another case of linux/windows versions of the
> application having different executable names.
>
> chrisp@laptop:~> tar -tf Download/ecmerge-2.3.123.linux.x86.tbz
> /usr/local/bin/ecmerge
> /opt/elliecomputing/ecmerge/guimerge
> /opt/elliecomputing/ecmerge/guimerge.exe

Indeed, well except that Linux has both "ecmerge" and "guimerge", whereas Windows only has "guimerge", which is why I went with the latter. Giving it a second thought, my patch is a little inconvenient for Linux users, as it will stop making ecmerge work out of the box (without first setting mergetool.ecmerge.path), whereas Windows users need to set mergetool.ecmerge.path anyway.

I've also contacted the makers of ECMerge and asked them to unify the naming across platforms. Maybe we should just drop this patch until they did.

Chris, what do you think?
-- 
Sebastian Schuberth
Previous: Chris PackhamNext: Chris Packham
Message 6 of 8 in “Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)”
  1. 0/3 Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)Sebastian Schuberth, Feb 26, 2011
  2. 1/3 mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth, Feb 26, 2011
  3. 2/3 mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth, Feb 26, 2011
  4. 3/3 mergetool--lib: Add the proper executable name for ECMergeSebastian Schuberth, Feb 26, 2011
  5. Chris PackhamFeb 27, 2011
  6. Sebastian SchuberthFeb 27, 2011
  7. Chris PackhamFeb 27, 2011
  8. Junio C HamanoFeb 27, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.