Mercurial > evolve
comparison tests/test-evolve-content-divergent-corner-cases.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | d70db7e455dc |
| children | aafd51f145ea |
comparison
equal
deleted
inserted
replaced
| 4514:ef1c322c389d | 4516:f54bb6eaf5e6 |
|---|---|
| 60 | 60 |
| 61 $ hg prune -s 8374d2ddc3a4 "desc('added b')" | 61 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
| 62 1 changesets pruned | 62 1 changesets pruned |
| 63 $ hg prune -s 593c57f2117e "desc('added b')" --hidden | 63 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
| 64 1 changesets pruned | 64 1 changesets pruned |
| 65 2 new content-divergent changesets | |
| 66 | 65 |
| 67 $ hg log -G | 66 $ hg log -G |
| 68 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | 67 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
| 69 | | 68 | |
| 70 | * 2:593c57f2117e@default(draft) divergent [content-divergent] | 69 | o 2:593c57f2117e@default(draft) divergent [content-divergent] |
| 71 |/ | 70 |/ |
| 72 o 0:9092f1db7931@default(draft) added a [] | 71 o 0:9092f1db7931@default(draft) added a [] |
| 73 | 72 |
| 74 | 73 |
| 75 $ hg evolve --all --any --content-divergent | 74 $ hg evolve --all --any --content-divergent |
| 120 | 119 |
| 121 $ hg prune -s b2ae71172042 48819a835615 | 120 $ hg prune -s b2ae71172042 48819a835615 |
| 122 1 changesets pruned | 121 1 changesets pruned |
| 123 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden | 122 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden |
| 124 1 changesets pruned | 123 1 changesets pruned |
| 125 2 new content-divergent changesets | |
| 126 | 124 |
| 127 $ hg log -G | 125 $ hg log -G |
| 128 @ 7:b2ae71172042@default(draft) add _c [content-divergent] | 126 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
| 129 | | 127 | |
| 130 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] | 128 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
| 131 |/ | 129 |/ |
| 132 | o 4:45bf1312f454@default(draft) divergent [] | 130 | o 4:45bf1312f454@default(draft) divergent [] |
| 133 |/ | 131 |/ |
| 134 o 0:9092f1db7931@default(draft) added a [] | 132 o 0:9092f1db7931@default(draft) added a [] |
| 135 | 133 |
| 177 | 175 |
| 178 $ hg prune -s 6b096fb45070 37445b16603b | 176 $ hg prune -s 6b096fb45070 37445b16603b |
| 179 1 changesets pruned | 177 1 changesets pruned |
| 180 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden | 178 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden |
| 181 1 changesets pruned | 179 1 changesets pruned |
| 182 2 new content-divergent changesets | |
| 183 $ hg log -G | 180 $ hg log -G |
| 184 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] | 181 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] |
| 185 | | 182 | |
| 186 | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] | 183 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |
| 187 |/ | 184 |/ |
| 188 o 0:135f39f4bd78@default(draft) add _a [] | 185 o 0:135f39f4bd78@default(draft) add _a [] |
| 189 | 186 |
| 190 | 187 |
| 191 $ cat >$TESTTMP/test_extension.py << EOF | 188 $ cat >$TESTTMP/test_extension.py << EOF |