https://bz.mercurial-scm.org/show_bug.cgi?id=6972
Bug ID: 6972
Summary: Changing branch of merge loses changes
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: m...@manueljacob.de
CC: mercurial-de...@mercurial-scm.org
Python Version: ---
In the following example, changing the branch of a merge (revision 2) with `hg
branch -r 2` (resulting in revision 3) loses the changes made to `a` in
revision 1.
$ echo a1 > a
$ hg add a
$ hg ci -m 'add a'
$ hg branch change_a -q
$ echo a2 > a
$ hg ci -m 'change a'
$ hg up 0 -q
$ hg merge 1 -q
$ hg ci -m 'merge'
$ hg branch -r 2 merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changed branch on 1 changesets
$ hg --hidden diff --from 2 --to 3
diff -r 6a13ba64c184 -r 92645fb8c2de a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-a2
+a1
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
