Mercurial > evolve

comparison tests/test-divergent.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents 98941c28f3e2 d00f0c369bc7
children
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
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 58 2 new 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 | o 2:593c57f2117e@default(draft) divergent [content-divergent] 63 | o 2:593c57f2117e@default(draft) divergent [content-divergent]
68 $ hg evolve --all --any --content-divergent 68 $ hg evolve --all --any --content-divergent
69 merge:[2] divergent 69 merge:[2] divergent
70 with: [3] divergent 70 with: [3] divergent
71 base: [1] added b 71 base: [1] added b
72 updating to "local" side of the conflict: 593c57f2117e 72 updating to "local" side of the conflict: 593c57f2117e
73 merging "other" content-divergent changeset '8374d2ddc3a4' 73 merging "other" divergent changeset '8374d2ddc3a4'
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 working directory is now at 45bf1312f454 75 working directory is now at 45bf1312f454
76 $ hg log -G 76 $ hg log -G
77 @ 4:45bf1312f454@default(draft) divergent [] 77 @ 4:45bf1312f454@default(draft) divergent []
78 | 78 |
113 113
114 $ hg prune -s b2ae71172042 48819a835615 114 $ hg prune -s b2ae71172042 48819a835615
115 1 changesets pruned 115 1 changesets pruned
116 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden 116 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden
117 1 changesets pruned 117 1 changesets pruned
118 2 new content-divergent changesets 118 2 new 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 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] 123 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
129 $ hg evolve --all --any --content-divergent 129 $ hg evolve --all --any --content-divergent
130 merge:[6] add cdivergent1 130 merge:[6] add cdivergent1
131 with: [7] add _c 131 with: [7] add _c
132 base: [5] add _c 132 base: [5] add _c
133 updating to "local" side of the conflict: e3ff64ce8d4c 133 updating to "local" side of the conflict: e3ff64ce8d4c
134 merging "other" content-divergent changeset 'b2ae71172042' 134 merging "other" divergent changeset 'b2ae71172042'
135 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 135 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
136 nothing changed 136 nothing changed
137 working directory is now at e3ff64ce8d4c 137 working directory is now at e3ff64ce8d4c
138 138
139 $ cd .. 139 $ cd ..
170 170
171 $ hg prune -s 6b096fb45070 37445b16603b 171 $ hg prune -s 6b096fb45070 37445b16603b
172 1 changesets pruned 172 1 changesets pruned
173 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden 173 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden
174 1 changesets pruned 174 1 changesets pruned
175 2 new content-divergent changesets 175 2 new 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 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] 179 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent]
180 |/ 180 |/
198 [2] 198 [2]
199 $ hg evolve --content-divergent 199 $ hg evolve --content-divergent
200 merge:[3] bdivergent 200 merge:[3] bdivergent
201 with: [2] bdivergent 201 with: [2] bdivergent
202 base: [1] add _b 202 base: [1] add _b
203 merging "other" content-divergent changeset '05a6b6a9e633' 203 merging "other" divergent changeset '05a6b6a9e633'
204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 working directory is now at 73ff357d3975 205 working directory is now at 73ff357d3975
206 206
207 $ cd .. 207 $ cd ..