Mercurial > evolve
comparison tests/test-amend.t @ 302:d68ccae92d52
obsolete: make collapse create less markers
Collapsing A and B into C was registering:
A -> C
B -> C
A -> B
At this point, the last relation brings nothing and is removed for the
sake of simplicity:
A -> C
B -> C
test-evolve.t is slightly modified as one of the relations let stabilize
compute a target outside of the parent revision tree. This is a
stabilize bug, not trivial to fix, so let's tweak the test for now.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 23 Jun 2012 11:14:09 +0200 |
| parents | 87e4d1eec5e8 |
| children | cdcdedc532b7 |
comparison
equal
deleted
inserted
replaced
| 301:b41ff69388a8 | 302:d68ccae92d52 |
|---|---|
| 24 marked working directory as branch foo | 24 marked working directory as branch foo |
| 25 (branches are permanent and global, did you want a bookmark?) | 25 (branches are permanent and global, did you want a bookmark?) |
| 26 $ hg amend | 26 $ hg amend |
| 27 $ hg debugsuccessors | 27 $ hg debugsuccessors |
| 28 07f494440405 a34b93d251e4 | 28 07f494440405 a34b93d251e4 |
| 29 07f494440405 bd19cbe78fbf | |
| 30 bd19cbe78fbf a34b93d251e4 | 29 bd19cbe78fbf a34b93d251e4 |
| 31 $ hg branch | 30 $ hg branch |
| 32 foo | 31 foo |
| 33 $ hg branches | 32 $ hg branches |
| 34 foo 2:a34b93d251e4 | 33 foo 2:a34b93d251e4 |
| 63 $ hg amend --change 2 | 62 $ hg amend --change 2 |
| 64 abort: no updates found | 63 abort: no updates found |
| 65 [255] | 64 [255] |
| 66 $ hg debugsuccessors | 65 $ hg debugsuccessors |
| 67 07f494440405 a34b93d251e4 | 66 07f494440405 a34b93d251e4 |
| 68 07f494440405 bd19cbe78fbf | |
| 69 bd19cbe78fbf a34b93d251e4 | 67 bd19cbe78fbf a34b93d251e4 |
| 70 $ hg phase 2 | 68 $ hg phase 2 |
| 71 2: draft | 69 2: draft |
| 72 $ glog | 70 $ glog |
| 73 @ 4@foo(draft) reseta | 71 @ 4@foo(draft) reseta |
| 90 $ hg amend --change 2 | 88 $ hg amend --change 2 |
| 91 abort: no updates found | 89 abort: no updates found |
| 92 [255] | 90 [255] |
| 93 $ hg debugsuccessors | 91 $ hg debugsuccessors |
| 94 07f494440405 a34b93d251e4 | 92 07f494440405 a34b93d251e4 |
| 95 07f494440405 bd19cbe78fbf | |
| 96 7384bbcba36f 000000000000 | 93 7384bbcba36f 000000000000 |
| 97 bd19cbe78fbf a34b93d251e4 | 94 bd19cbe78fbf a34b93d251e4 |
| 98 $ glog | 95 $ glog |
| 99 @ 6@foo(secret) amends a34b93d251e49c93d5685ebacad785c73a7e8605 | 96 @ 6@foo(secret) amends a34b93d251e49c93d5685ebacad785c73a7e8605 |
| 100 | | 97 | |