https://bz.mercurial-scm.org/show_bug.cgi?id=5944
Bug ID: 5944
Summary: `hg evolve` of merge commit runs into merge conflicts
in unaffected file
Product: Mercurial
Version: 4.6
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: martinv...@google.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Here is a test case that shows the problem:
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> evolve=
> EOF
$ hg init
$ echo v0 > irrelevant
$ hg ci -Aqm v0
$ echo v1 > irrelevant
$ hg ci -qm v1
$ echo v2 > irrelevant
$ hg ci -qm v2
$ hg co 0 # v0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a > a
$ hg ci -Aqm a
$ hg co 1 # v1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > b
$ hg ci -Aqm b
$ hg merge 3 # a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m merge
$ hg rebase -r 3 -d 2 # a onto v2
rebasing 3:58eeb9c044de "a"
1 new orphan changesets
$ hg evolve -r .
move:[5] merge
atop:[6] a
merging irrelevant
warning: conflicts while merging irrelevant! (edit, then use 'hg resolve
--mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
--
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
