Retry merge with custom merge tool incorrectly uses result of previous merge tool as input
Created originally on Bitbucket by rationull (Jonathan Little)
I have encountered the following problem introduced in Tortoise HG 3.6. I'm not sure whether it's a bug in THG's external merge tool configuration or whether it's a bug in Mercurial itself -- but it seems to me most likely to be a THG issue so I'm reporting it here Please correct me if I'm wrong and I'll refile it in HG's bugzilla database. The behavior I'm seeing:
- Set merge tool to internal:merge
- Create a repository with two separate branches, with a change on each branch such that the changes conflict with each other.
- Merge the two branch heads. internal:merge will leave the conflicting file with conflict markers.
- Run "thg resolve", select "kdiff3" as the merge tool, and run "Tool Resolve" on the conflicting file.
Expected result: KDiff3 correctly shows the shared ancestor content and the two conflicting revisions (see Expected.jpg).
Actual result: KDiff3 shows the shared ancestor revision and "other" conflicting revision correctly, but the local conflicting revision contains the merge markers from internal:merge.
This behavior started with 3.6.0. I left it rated "major" because it breaks my merge workflow.