Mercurial > evolve
diff tests/test-tutorial.t @ 1239:8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Prune used to compute the destination commit to update to after creating the
obsolescence markers. This is a commit to prevent a bug that would occur
with the changes in inhibit for transactions (next commit).
Indeed, with that change in inhibit, when creating the obsolescence markers in
prune, they would get inhibited right away and we wouldn't update to the first
non obsolete parent but stay on the same node as its obsolescence would have
been inhibited (bug).
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Thu, 02 Apr 2015 18:33:44 -0700 |
parents | 0c879e986ce4 |
children | aff6bc2a6b2d |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri Apr 03 11:35:46 2015 -0700 +++ b/tests/test-tutorial.t Thu Apr 02 18:33:44 2015 -0700 @@ -289,9 +289,9 @@ not fit well in my standard shopping list) $ hg prune . # "." is for working directory parent - 1 changesets pruned 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 41aff6a42b75 + 1 changesets pruned The silly changeset is gone. @@ -804,9 +804,9 @@ In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: $ hg prune ee942144f952 - 1 changesets pruned 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at a44c85f957d3 + 1 changesets pruned 1 new unstable changesets