https://bz.mercurial-scm.org/show_bug.cgi?id=6670
Bug ID: 6670
Summary: Merge-tools shows the "output" file for the "local"
argument
Product: Mercurial
Version: 6.1
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: extdiff
Assignee: bugzi...@mercurial-scm.org
Reporter: george.tulip....@gmail.com
CC: mercurial-devel@mercurial-scm.org
Python Version: ---
NOTE: This seems to be a regression somewhere between 5.3.1 and 6.1
I've tested on Linux only.
Repro:
1. Configure a merge-tool (I use vimdiff) for the repo.
2. Rebase a commit onto another one that has a conflict.
3. vimdiff pops up
EXPECTED:
4 files are loaded:
${FILENAME}~local
${FILENAME}~base
${FILENAME}~other
${FILENAME}
with different content in each one.
ACTUAL:
${FILENAME}~local has the same content as ${FILENAME}
NOTES:
On 5.3.1 ${FILENAME}~local is the unchanged content of the file that we are
rebasing onto. On 6.1 ${FILENAME}~local contains the exact contents of
${FILENAME} that includes the attempt at an automerge (including the <<<==>>>
conflict markers).
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
