Red Hat Bugzilla – Bug 442594
difference in merge behavior [i.e kdiff3] between mercurial 0.9.5 and 1.0
Last modified: 2008-04-16 11:18:40 EDT
Description of problem: Hg merge brings up kdiff3 automatically with mercurial 0.9.5 - but not with 1.0 Version-Release number of selected component (if applicable): mercurial-0.9.5-6.fc8 mercurial-1.0-12.fc8 How reproducible: always Steps to Reproduce: 1. create a repo [and a clone] with merge conflict 2. do 'hg merge' with both versions of mercurial 3. Actual results: <<<< 0.9.5 >>>>>> asterix:/home/balay/tmp/bar>hg merge resolving manifests merging foobar kbuildsycoca running... <<<< 1.0 >>>>>> asterix:/home/balay/tmp/bar>hg merge resolving manifests merging foobar warning: conflicts during merge. merging foobar failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2 asterix:/home/balay/tmp/bar> Expected results: kdiff3 invocation with 'hg merge' Additional info: The old behavior is restored by adding the following to ~/.hgrc as per http://www.selenic.com/mercurial/wiki/index.cgi/.hgrc [merge-tools] kdiff3.args = $base $local $other -o $output kdiff3.priority = 1 So there are 2 issues here.. - Should kdiff3 be the default mergetool - as before? - the default kdiff3.args is in /etc/mercurial/hgrc.d/mergetools.hgrc is incorrect? [If I don't redefine kdiff3.args - the kdif3 gui is invoked incorrectly - with only 3 windows - instead of 4 - I normally see]
Created attachment 302579 [details] mergetools patch
OK, closing
Looks like the above change is not required. [I tried it - and it didn't work]. The primary problem is - the config file is named mergetools.hgrc. It should be renamed to mergetools.rc [with the wrong name - it was not being read in] After renaming the file - 'hg merge' brought up kdiff3, and it worked correctly.
Yes, the rename is fixed also in 1.0-13.