Mercurial > evolve
comparison tests/test-divergent.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | d00f0c369bc7 |
| children |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 53 | 53 |
| 54 $ hg prune -s 8374d2ddc3a4 "desc('added b')" | 54 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
| 55 1 changesets pruned | 55 1 changesets pruned |
| 56 $ hg prune -s 593c57f2117e "desc('added b')" --hidden | 56 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
| 57 1 changesets pruned | 57 1 changesets pruned |
| 58 2 new content-divergent changesets | |
| 59 | 58 |
| 60 $ hg log -G | 59 $ hg log -G |
| 61 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | 60 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
| 62 | | 61 | |
| 63 | * 2:593c57f2117e@default(draft) divergent [content-divergent] | 62 | o 2:593c57f2117e@default(draft) divergent [content-divergent] |
| 64 |/ | 63 |/ |
| 65 o 0:9092f1db7931@default(draft) added a [] | 64 o 0:9092f1db7931@default(draft) added a [] |
| 66 | 65 |
| 67 | 66 |
| 68 $ hg evolve --all --any --content-divergent | 67 $ hg evolve --all --any --content-divergent |
| 113 | 112 |
| 114 $ hg prune -s b2ae71172042 48819a835615 | 113 $ hg prune -s b2ae71172042 48819a835615 |
| 115 1 changesets pruned | 114 1 changesets pruned |
| 116 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden | 115 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden |
| 117 1 changesets pruned | 116 1 changesets pruned |
| 118 2 new content-divergent changesets | |
| 119 | 117 |
| 120 $ hg log -G | 118 $ hg log -G |
| 121 @ 7:b2ae71172042@default(draft) add _c [content-divergent] | 119 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
| 122 | | 120 | |
| 123 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] | 121 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
| 124 |/ | 122 |/ |
| 125 | o 4:45bf1312f454@default(draft) divergent [] | 123 | o 4:45bf1312f454@default(draft) divergent [] |
| 126 |/ | 124 |/ |
| 127 o 0:9092f1db7931@default(draft) added a [] | 125 o 0:9092f1db7931@default(draft) added a [] |
| 128 | 126 |
| 170 | 168 |
| 171 $ hg prune -s 6b096fb45070 37445b16603b | 169 $ hg prune -s 6b096fb45070 37445b16603b |
| 172 1 changesets pruned | 170 1 changesets pruned |
| 173 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden | 171 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden |
| 174 1 changesets pruned | 172 1 changesets pruned |
| 175 2 new content-divergent changesets | |
| 176 $ hg log -G | 173 $ hg log -G |
| 177 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] | 174 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] |
| 178 | | 175 | |
| 179 | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] | 176 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |
| 180 |/ | 177 |/ |
| 181 o 0:135f39f4bd78@default(draft) add _a [] | 178 o 0:135f39f4bd78@default(draft) add _a [] |
| 182 | 179 |
| 183 | 180 |
| 184 $ cat >$TESTTMP/test_extension.py << EOF | 181 $ cat >$TESTTMP/test_extension.py << EOF |