https://bz.mercurial-scm.org/show_bug.cgi?id=5967
Bug ID: 5967
Summary: hg evolve will make incorrect obsmarkers after
resolving conflicts
Product: Mercurial
Version: unspecified
Hardware: PC
OS: All
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: matv...@gmail.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Steps:
1. Create a commit (a) and another commit on top of it (b)
... edit ...
$ hg commit -Am 'this is a line'
adding foo
... edit ...
$ hg commit -m 'next line'
2. Amend (a) such that it conflicts with changes in (b)
$ hg prev
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[0] this is a line
... edit ...
$ hg amend
1 new orphan changesets
3. Run "hg evolve -t :fail" and resolve the conflicts such that you reject
the changes in (b)
$ hg evolve -t :fail
move:[1] next line
atop:[2] this is a line
fix conflicts and see `hg help evolve.interrupted`
... edit ...
$ hg resolve foo
merging foo
merge: warning: conflicts during merge
Waiting for Emacs...
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
evolving 1:ec12d49a7867 "next line""
evolution of 1:ec12d49a7867 created no changes to commit
Observed results:
obslog creates an obsmarker as a result of the evolve which would usually
be a prune. If I do this with a normal editor upon the first hg evolve and
don't use "hg resolve" or "hg evolve --continue", then this obsmarker is not
created.
$ hg obslog
◍ 8543e90b8b68 (2) this is a line
│╲
◌ │ d4edd55fd1d9 (0) this is a line
╱ rewritten(content) as 8543e90b8b68 using amend by Matt DeVore
<matv...@google.com> (Wed Aug 22 18:18:20 2018 -0700)
│
◌ ec12d49a7867 (1) next line"
rewritten(description, date, parent, content) as 8543e90b8b68 using
evolve by Matt DeVore <matv...@google.com> (Wed Aug 22 18:18:55 2018 -0700)
Expected results:
obsmarker is not created.
--
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
