Re: [PATCH] mergetool: export variables for use by custom mergetools
- From
Evgeny <evgeny.zislis@gmail.com>
- Date
- May 18, 2008, 00:12 UTC
- Message-ID
- <b6840c770805171712j636c8f43tde9c0a0b74ec58b@mail.gmail.com>
- In-Reply-To
- <20080518000739.GA29689@hashpling.org>
I also tried directly with cmd = $HOME/Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" .....
It also did not work without $PWD, but it also did not work when I used it from the command line. Some weird error, saying :
Incorrect parameters: './test.BASE.18308' is (or points to) an invalid file. './test.LOCAL.18308' is (or points to) an invalid file. './test.REMOTE.18308' is (or points to) an invalid file.
Use 'launchp4merge -h' for more help.
I think it's a p4merge bug, they did change it to Qt4 lately. Probably broke a couple of things.
On Sun, May 18, 2008 at 3:07 AM, Charles Bailey <charles@hashpling.org> wrote:
Show 33 quoted lines
> On Sun, May 18, 2008 at 02:55:10AM +0300, Evgeny wrote: >> Ohh, so the documentation is not clear then. > > That's a pity, I did make an effort with the documentation, but > explaining things is not my strongest ability. > >> >> [mergetool "p4merge"] >> cmd = p4merge.sh "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" >> keepBackup = false >> >> [merge] >> tool = p4merge >> > > "$PWD/" looks very wrong. Perhaps p4merge.sh is changing its working > directory and not handling the passed paths correctly? > >> Thanks for the explanation! >> I believe that an example in the documentation could be a nice >> addition, to clear things up in the future. > > Yes, there were a few examples in the original patch mail text (note > that 'path' has sinces changed to 'MERGED'), but they never made it to > the documentation. There's also some discussion about eval vs. leaking > environment variables: > > http://thread.gmane.org/gmane.comp.version-control.git/74059 > > -- > Charles Bailey > http://ccgi.hashpling.plus.com/blog/ >