Mercurial > evolve
diff setup.py @ 4688:75329efe56a9 stable
tests: demonstrate obsmarker creation after discarding conflicting changes
Continued evolve creates an incorrect obsmarker that says 2 is a successor of
1. It's incorrect because 1 was dropped as it created no changes to commit
(after conflict resolution that discarded its changes).
If evolve does the same thing in one go (e.g. just by using --tool :local and
without subsequent need to continue) the obsmarker is correct.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 22 Dec 2018 18:31:32 +0800 |
parents | efac9aad0963 |
children | 9f2e480ad786 |