Mercurial > evolve

comparison tests/test-divergent.t @ 4227:4684e6db4480 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 09 Nov 2018 20:18:59 +0100
parents d00f0c369bc7
children 537fd9a86c06 a2fdbece7ce1
comparison
equal deleted inserted replaced
4226:94214f8291eb 4227:4684e6db4480
58 2 new content-divergent changesets 58 2 new content-divergent changesets
59 59
60 $ hg log -G 60 $ hg log -G
61 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] 61 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent]
62 | 62 |
63 | * 2:593c57f2117e@default(draft) divergent [content-divergent] 63 | o 2:593c57f2117e@default(draft) divergent [content-divergent]
64 |/ 64 |/
65 o 0:9092f1db7931@default(draft) added a [] 65 o 0:9092f1db7931@default(draft) added a []
66 66
67 67
68 $ hg evolve --all --any --content-divergent 68 $ hg evolve --all --any --content-divergent
118 2 new content-divergent changesets 118 2 new content-divergent changesets
119 119
120 $ hg log -G 120 $ hg log -G
121 @ 7:b2ae71172042@default(draft) add _c [content-divergent] 121 @ 7:b2ae71172042@default(draft) add _c [content-divergent]
122 | 122 |
123 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] 123 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
124 |/ 124 |/
125 | o 4:45bf1312f454@default(draft) divergent [] 125 | o 4:45bf1312f454@default(draft) divergent []
126 |/ 126 |/
127 o 0:9092f1db7931@default(draft) added a [] 127 o 0:9092f1db7931@default(draft) added a []
128 128
174 1 changesets pruned 174 1 changesets pruned
175 2 new content-divergent changesets 175 2 new content-divergent changesets
176 $ hg log -G 176 $ hg log -G
177 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] 177 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent]
178 | 178 |
179 | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] 179 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent]
180 |/ 180 |/
181 o 0:135f39f4bd78@default(draft) add _a [] 181 o 0:135f39f4bd78@default(draft) add _a []
182 182
183 183
184 $ cat >$TESTTMP/test_extension.py << EOF 184 $ cat >$TESTTMP/test_extension.py << EOF