Mercurial > evolve
diff tests/test-evolve.t @ 1157:5951969400ce stable
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
The evolve algorithm picked a bad changesets to evolve (unstable changeset with
no obsolete parent (but unstable parent). And then get confused assuming that is
the first parent was not obsolete, the second should be.
This changeset fixed the issue by preventing selection of direct descendant of
[.] when evolving.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 11 Nov 2014 12:38:49 +0000 |
| parents | ca17770d2ee9 |
| children | cc3e68120185 |
line wrap: on
line diff
--- a/tests/test-evolve.t Tue Nov 11 11:28:01 2014 +0000 +++ b/tests/test-evolve.t Tue Nov 11 12:38:49 2014 +0000 @@ -846,3 +846,17 @@ | o 0 [default] a0 + +Evolve from the middle of a stack pick the right changesets. + + $ hg up 7 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg ci --amend -m 'a1__' + 2 new unstable changesets + + $ hg up 8 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg evolve + nothing to evolve here + (2 troubled changesets, do you want --any ?) + [2]