On Mon, 21 Jul 2008, Mark J. Nelson wrote: >> [merge-tools] >> meld.gui=True >> meld.priority=0 > > That looks correct. I have the following: > > [merge-tools] > filemerge.gui=True > filemerge.args=-a $base $local $other $output > filemerge.priority=1 > > meld.gui=True > meld.priority=0 > > ...which should use filemerge if it's available, and fall back to meld > otherwise.
I can try adding filemerge, it's in the path also...but... > It will only pop up a merge tool if it can't figure out what to do. So > you might actually not need to tell it anything, if there were no > ambiguous/overlapping edits to the same files. Hmmm...when I run merge it tells me: [duboff at eagle uts]$ hg merge abort: untracked file in working directory differs from file in requested revision: 'usr/src/pkgdefs/SUNWiscsitgtr/depend' > After the "hg merge" command exits, what does "hg status -mard" tell you? Nothing: [duboff at eagle uts]$ hg merge abort: untracked file in working directory differs from file in requested revision: 'usr/src/pkgdefs/SUNWiscsitgtr/depend' [duboff at eagle uts]$ hg status -mard [duboff at eagle uts]$ > your changes? Because that would indicate that it completed successfully, > otherwise it would be telling you to try again be doing an "hg update -C > old_rev ; hg merge new_rev" sequence. It didn't tell me that, but I did a hg update -C (which shoult take it to the tip, and tip is the right one per hg head. Then when I hg merge, it is now tell me [duboff at eagle uts]$ hg merge merging .hgtags I'm waiting to see if it gives me a meld window... -- Alan DuBoff - Solaris x86 IHV/OEM Group
