https://bz.mercurial-scm.org/show_bug.cgi?id=5966
Bug ID: 5966
Summary: 'hg evolve --continue' sometimes ignores unresolved
changes
Product: Mercurial
Version: unspecified
Hardware: PC
OS: All
Status: UNCONFIRMED
Severity: bug
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
If hg evolve --continue is run after the merge tool returns a non-zero exit
code, then it will ignore any pending resolves.
1. set contents of ~/.hgrc:
[extensions]
evolve =
[merge-tools]
mymerge.args = $local $other $base $output
[ui]
merge = mymerge
2. set contents of $PATH/mymerge:
#!/bin/bash
exit 1
3. make commits and an amend such that an evolve will cause a merge conflict
4. run hg evolve - you will see this because of the merge tool you just set up:
move:[6] after 2
atop:[7] add foo
merging foo
merging foo failed!
fix conflicts and see `hg help evolve.interrupted`
5. run hg evolve --continue
Actual results
--------------
You will see this:
hg evolve --continue
evolving 6:8a7d928ee02f "after 2"
evolution of 6:8a7d928ee02f created no changes to commit
And the pending resolves will still be around - you can run "hg resolve --all"
to see them.
Expected results
--------------
hg evolve asks me to run "hg resolve" without doing anything.
--
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
