[Bug 4950] New: evolve --rev --divergent failed when merge had nothing to do
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Nov 13 08:31:21 UTC 2015
https://bz.mercurial-scm.org/show_bug.cgi?id=4950
Bug ID: 4950
Summary: evolve --rev --divergent failed when merge had nothing
to do
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzilla at selenic.com
Reporter: dancol at dancol.org
CC: mercurial-devel at selenic.com,
pierre-yves.david at ens-lyon.org
Evolve marked these revisions as divergent even though diff -r reports that
they have the same trees. Is the operation below failing because merge succeeds
trivially? I was able to just rebase one of the changes on top of the other
instead.
I've lost the state for the repro.
Version is 3.5.1+217-46c62473df5c
$ hg evo --divergent --any
merge:[1024446] Make ApplicationLike a regular class and remove silly
duplicated code
with: [1024448] Make ApplicationLike a regular class and remove silly
duplicated code
base: [1024278] Make ApplicationLike a regular class and remove silly
duplicated code
updating to "local" conflict
6 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing changed
transaction abort!
rollback completed
working directory is now at 20b687f74957
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list