Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1238:ee695c7d1bf1 | 1239:8a06b32061ce |
|---|---|
| 287 | 287 |
| 288 I have a new commit but I realize that don't want it. (transport shop list does | 288 I have a new commit but I realize that don't want it. (transport shop list does |
| 289 not fit well in my standard shopping list) | 289 not fit well in my standard shopping list) |
| 290 | 290 |
| 291 $ hg prune . # "." is for working directory parent | 291 $ hg prune . # "." is for working directory parent |
| 292 1 changesets pruned | |
| 293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 294 working directory now at 41aff6a42b75 | 293 working directory now at 41aff6a42b75 |
| 294 1 changesets pruned | |
| 295 | 295 |
| 296 The silly changeset is gone. | 296 The silly changeset is gone. |
| 297 | 297 |
| 298 $ hg log -G | 298 $ hg log -G |
| 299 @ 41aff6a42b75 (draft): adding fruit | 299 @ 41aff6a42b75 (draft): adding fruit |
| 802 | 802 |
| 803 | 803 |
| 804 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: | 804 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
| 805 | 805 |
| 806 $ hg prune ee942144f952 | 806 $ hg prune ee942144f952 |
| 807 1 changesets pruned | |
| 808 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 807 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 809 working directory now at a44c85f957d3 | 808 working directory now at a44c85f957d3 |
| 809 1 changesets pruned | |
| 810 1 new unstable changesets | 810 1 new unstable changesets |
| 811 | 811 |
| 812 | 812 |
| 813 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset | 813 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
| 814 is neither dead or obsolete. My repository is in an unstable state again. | 814 is neither dead or obsolete. My repository is in an unstable state again. |