Mercurial > evolve

comparison tests/test-evolve-abort-contentdiv.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 d00f0c369bc7
children 185770c10a4e
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
49 working directory parent is obsolete! (c41c793e0ef1) 49 working directory parent is obsolete! (c41c793e0ef1)
50 (use 'hg evolve' to update to its successor: e49523854bc8) 50 (use 'hg evolve' to update to its successor: e49523854bc8)
51 51
52 $ echo foobar > d 52 $ echo foobar > d
53 $ hg amend 53 $ hg amend
54 2 new content-divergent changesets 54 2 new divergent changesets
55 $ hg glog --hidden 55 $ hg glog --hidden
56 @ 6:9c1631e352d9 added d 56 @ 8:9c1631e352d9 added d
57 | () draft 57 | () draft
58 | o 5:e49523854bc8 added d 58 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
59 |/ () draft 59 | | () draft
60 +---o 6:e49523854bc8 added d
61 | | () draft
62 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
63 | |/ () draft
60 | x 4:c41c793e0ef1 added d 64 | x 4:c41c793e0ef1 added d
61 |/ () draft 65 |/ () draft
62 o 3:ca1b80f7960a added c 66 o 3:ca1b80f7960a added c
63 | () draft 67 | () draft
64 o 2:b1661037fa25 added b 68 o 2:b1661037fa25 added b
67 | () draft 71 | () draft
68 o 0:8fa14d15e168 added hgignore 72 o 0:8fa14d15e168 added hgignore
69 () draft 73 () draft
70 74
71 $ hg evolve --content-divergent 75 $ hg evolve --content-divergent
72 merge:[6] added d 76 merge:[8] added d
73 with: [5] added d 77 with: [6] added d
74 base: [4] added d 78 base: [4] added d
75 merging "other" content-divergent changeset 'e49523854bc8' 79 merging "other" divergent changeset 'e49523854bc8'
76 merging d 80 merging d
77 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 81 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 82 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
79 fix conflicts and see `hg help evolve.interrupted` 83 fix conflicts and see `hg help evolve.interrupted`
80 [1] 84 [1]
81 85
82 $ hg status -v 86 $ hg status -v
83 M d 87 M d
84 # The repository is in an unfinished *evolve* state.
85
86 # Unresolved merge conflicts:
87 #
88 # d
89 #
90 # To mark files as resolved: hg resolve --mark FILE
91
92 # To continue: hg evolve --continue
93 # To abort: hg evolve --abort
94 # To stop: hg evolve --stop
95 # (also see `hg help evolve.interrupted`)
96
97 88
98 $ hg evolve --abort 89 $ hg evolve --abort
99 evolve aborted 90 evolve aborted
100 working directory is now at 9c1631e352d9 91 working directory is now at 9c1631e352d9
101 92
102 $ hg glog --hidden 93 $ hg glog --hidden
103 @ 6:9c1631e352d9 added d 94 @ 8:9c1631e352d9 added d
104 | () draft 95 | () draft
105 | o 5:e49523854bc8 added d 96 | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
106 |/ () draft 97 | | () draft
98 +---o 6:e49523854bc8 added d
99 | | () draft
100 | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
101 | |/ () draft
107 | x 4:c41c793e0ef1 added d 102 | x 4:c41c793e0ef1 added d
108 |/ () draft 103 |/ () draft
109 o 3:ca1b80f7960a added c 104 o 3:ca1b80f7960a added c
110 | () draft 105 | () draft
111 o 2:b1661037fa25 added b 106 o 2:b1661037fa25 added b
123 $ hg amend 118 $ hg amend
124 $ hg up .^ 119 $ hg up .^
125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 120 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
126 $ echo bar > c 121 $ echo bar > c
127 $ hg amend 122 $ hg amend
128 2 new orphan changesets 123 2 new unstable changesets
129 $ hg up ca1b80f7960a --hidden 124 $ hg up ca1b80f7960a --hidden
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
131 working directory parent is obsolete! (ca1b80f7960a) 126 working directory parent is obsolete! (ca1b80f7960a)
132 (use 'hg evolve' to update to its successor: 2ba73e31f264) 127 (use 'hg evolve' to update to its successor: 2ba73e31f264)
133 $ echo foobar > c 128 $ echo foobar > c
134 $ hg amend 129 $ hg amend
135 2 new content-divergent changesets 130 2 new divergent changesets
136 $ echo bar > c 131 $ echo bar > c
137 $ hg amend 132 $ hg amend
138 133
139 $ hg glog --hidden 134 $ hg glog --hidden
140 @ 10:491e10505bae added c 135 @ 16:491e10505bae added c
141 | () draft 136 | () draft
142 | x 9:7398f702a162 added c 137 | x 15:b2451992ec73 temporary amend commit for 7398f702a162
143 |/ () draft 138 | | () draft
144 | o 8:2ba73e31f264 added c 139 | x 14:7398f702a162 added c
145 |/ () draft 140 |/ () draft
146 | o 7:f0f1694f123e added d 141 | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
147 | | () draft 142 | | () draft
148 | | x 6:9c1631e352d9 added d 143 +---o 12:2ba73e31f264 added c
149 | |/ () draft 144 | | () draft
150 | | o 5:e49523854bc8 added d 145 | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
151 | |/ () draft 146 | |/ () draft
147 | | o 10:f0f1694f123e added d
148 | |/ () draft
149 | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
150 | | | () draft
151 | | x 8:9c1631e352d9 added d
152 | |/ () draft
153 | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
154 | | | () draft
155 | +---o 6:e49523854bc8 added d
156 | | | () draft
157 | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
158 | | |/ () draft
152 | | x 4:c41c793e0ef1 added d 159 | | x 4:c41c793e0ef1 added d
153 | |/ () draft 160 | |/ () draft
154 | x 3:ca1b80f7960a added c 161 | x 3:ca1b80f7960a added c
155 |/ () draft 162 |/ () draft
156 o 2:b1661037fa25 added b 163 o 2:b1661037fa25 added b
159 | () draft 166 | () draft
160 o 0:8fa14d15e168 added hgignore 167 o 0:8fa14d15e168 added hgignore
161 () draft 168 () draft
162 169
163 $ hg evolve --all --content-divergent 170 $ hg evolve --all --content-divergent
164 merge:[8] added c 171 merge:[12] added c
165 with: [10] added c 172 with: [16] added c
166 base: [3] added c 173 base: [3] added c
167 updating to "local" side of the conflict: 2ba73e31f264 174 updating to "local" side of the conflict: 2ba73e31f264
168 merging "other" content-divergent changeset '491e10505bae' 175 merging "other" divergent changeset '491e10505bae'
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
170 merge:[5] added d 177 merge:[6] added d
171 with: [7] added d 178 with: [10] added d
172 base: [4] added d 179 base: [4] added d
173 updating to "local" side of the conflict: e49523854bc8 180 updating to "local" side of the conflict: e49523854bc8
174 merging "other" content-divergent changeset 'f0f1694f123e' 181 merging "other" divergent changeset 'f0f1694f123e'
175 merging d 182 merging d
176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 183 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 184 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
178 fix conflicts and see `hg help evolve.interrupted` 185 fix conflicts and see `hg help evolve.interrupted`
179 [1] 186 [1]
181 $ hg evolve --abort 188 $ hg evolve --abort
182 evolve aborted 189 evolve aborted
183 working directory is now at 491e10505bae 190 working directory is now at 491e10505bae
184 191
185 $ hg glog --hidden 192 $ hg glog --hidden
186 @ 10:491e10505bae added c 193 @ 16:491e10505bae added c
187 | () draft 194 | () draft
188 | x 9:7398f702a162 added c 195 | x 15:b2451992ec73 temporary amend commit for 7398f702a162
189 |/ () draft 196 | | () draft
190 | o 8:2ba73e31f264 added c 197 | x 14:7398f702a162 added c
191 |/ () draft 198 |/ () draft
192 | o 7:f0f1694f123e added d 199 | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
193 | | () draft 200 | | () draft
194 | | x 6:9c1631e352d9 added d 201 +---o 12:2ba73e31f264 added c
195 | |/ () draft 202 | | () draft
196 | | o 5:e49523854bc8 added d 203 | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
197 | |/ () draft 204 | |/ () draft
205 | | o 10:f0f1694f123e added d
206 | |/ () draft
207 | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
208 | | | () draft
209 | | x 8:9c1631e352d9 added d
210 | |/ () draft
211 | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
212 | | | () draft
213 | +---o 6:e49523854bc8 added d
214 | | | () draft
215 | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
216 | | |/ () draft
198 | | x 4:c41c793e0ef1 added d 217 | | x 4:c41c793e0ef1 added d
199 | |/ () draft 218 | |/ () draft
200 | x 3:ca1b80f7960a added c 219 | x 3:ca1b80f7960a added c
201 |/ () draft 220 |/ () draft
202 o 2:b1661037fa25 added b 221 o 2:b1661037fa25 added b
205 | () draft 224 | () draft
206 o 0:8fa14d15e168 added hgignore 225 o 0:8fa14d15e168 added hgignore
207 () draft 226 () draft
208 227
209 $ hg obslog -r . --all 228 $ hg obslog -r . --all
210 o 2ba73e31f264 (8) added c 229 o 2ba73e31f264 (12) added c
211 | 230 |
212 | @ 491e10505bae (10) added c 231 | @ 491e10505bae (16) added c
213 | | 232 | |
214 | x 7398f702a162 (9) added c 233 | x 7398f702a162 (14) added c
215 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) 234 |/ rewritten(content) as 491e10505bae by test (Thu Jan 01 00:00:00 1970 +0000)
216 | 235 |
217 x ca1b80f7960a (3) added c 236 x ca1b80f7960a (3) added c
218 rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 237 rewritten(content) as 2ba73e31f264 by test (Thu Jan 01 00:00:00 1970 +0000)
219 rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 238 rewritten(content) as 7398f702a162 by test (Thu Jan 01 00:00:00 1970 +0000)
220 239
221 $ cd .. 240 $ cd ..
222 241
223 Creating content-divergence on multiple parents when gca of divergent changesets 242 Creating content-divergence on multiple parents when gca of divergent changesets
224 is parent of one of the divergents and relocating leads to conflicts 243 is parent of one of the divergents and relocating leads to conflicts
253 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 272 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
254 working directory parent is obsolete! (c41c793e0ef1) 273 working directory parent is obsolete! (c41c793e0ef1)
255 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) 274 (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
256 $ echo bar > d 275 $ echo bar > d
257 $ hg amend 276 $ hg amend
258 2 new content-divergent changesets 277 2 new divergent changesets
259 278
260 $ hg glog 279 $ hg glog
261 @ 7:e49523854bc8 added d 280 @ 9:e49523854bc8 added d
262 | () draft 281 | () draft
263 | o 6:69bdd23a9b0d added d 282 | o 7:69bdd23a9b0d added d
264 | | () draft 283 | | () draft
265 o | 3:ca1b80f7960a added c 284 o | 3:ca1b80f7960a added c
266 | | () draft 285 | | () draft
267 o | 2:b1661037fa25 added b 286 o | 2:b1661037fa25 added b
268 |/ () draft 287 |/ () draft
270 | () draft 289 | () draft
271 o 0:8fa14d15e168 added hgignore 290 o 0:8fa14d15e168 added hgignore
272 () draft 291 () draft
273 292
274 $ hg evolve --content-divergent 293 $ hg evolve --content-divergent
275 merge:[7] added d 294 merge:[9] added d
276 with: [6] added d 295 with: [7] added d
277 base: [4] added d 296 base: [4] added d
278 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a 297 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
279 merging c 298 merging c
280 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 299 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
281 fix conflicts and see `hg help evolve.interrupted` 300 fix conflicts and see `hg help evolve.interrupted`
284 $ hg evolve --abort 303 $ hg evolve --abort
285 evolve aborted 304 evolve aborted
286 working directory is now at e49523854bc8 305 working directory is now at e49523854bc8
287 306
288 $ hg glog 307 $ hg glog
289 @ 7:e49523854bc8 added d 308 @ 9:e49523854bc8 added d
290 | () draft 309 | () draft
291 | o 6:69bdd23a9b0d added d 310 | o 7:69bdd23a9b0d added d
292 | | () draft 311 | | () draft
293 o | 3:ca1b80f7960a added c 312 o | 3:ca1b80f7960a added c
294 | | () draft 313 | | () draft
295 o | 2:b1661037fa25 added b 314 o | 2:b1661037fa25 added b
296 |/ () draft 315 |/ () draft
308 $ hg rm c 327 $ hg rm c
309 $ echo wat > d 328 $ echo wat > d
310 $ hg amend 329 $ hg amend
311 330
312 $ hg glog 331 $ hg glog
313 @ 8:33e4442acf98 added d 332 @ 11:33e4442acf98 added d
314 | () draft 333 | () draft
315 | o 7:e49523854bc8 added d 334 | o 9:e49523854bc8 added d
316 | | () draft 335 | | () draft
317 | o 3:ca1b80f7960a added c 336 | o 3:ca1b80f7960a added c
318 | | () draft 337 | | () draft
319 | o 2:b1661037fa25 added b 338 | o 2:b1661037fa25 added b
320 |/ () draft 339 |/ () draft
322 | () draft 341 | () draft
323 o 0:8fa14d15e168 added hgignore 342 o 0:8fa14d15e168 added hgignore
324 () draft 343 () draft
325 344
326 $ hg evolve --content-divergent 345 $ hg evolve --content-divergent
327 merge:[7] added d 346 merge:[9] added d
328 with: [8] added d 347 with: [11] added d
329 base: [4] added d 348 base: [4] added d
330 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a 349 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
331 updating to "local" side of the conflict: e49523854bc8 350 updating to "local" side of the conflict: e49523854bc8
332 merging "other" content-divergent changeset 'a663d1567f0b' 351 merging "other" divergent changeset 'a663d1567f0b'
333 merging d 352 merging d
334 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 353 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
335 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 354 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
336 fix conflicts and see `hg help evolve.interrupted` 355 fix conflicts and see `hg help evolve.interrupted`
337 [1] 356 [1]
339 $ hg evolve --abort 358 $ hg evolve --abort
340 evolve aborted 359 evolve aborted
341 working directory is now at 33e4442acf98 360 working directory is now at 33e4442acf98
342 361
343 $ hg glog 362 $ hg glog
344 @ 8:33e4442acf98 added d 363 @ 11:33e4442acf98 added d
345 | () draft 364 | () draft
346 | o 7:e49523854bc8 added d 365 | o 9:e49523854bc8 added d
347 | | () draft 366 | | () draft
348 | o 3:ca1b80f7960a added c 367 | o 3:ca1b80f7960a added c
349 | | () draft 368 | | () draft
350 | o 2:b1661037fa25 added b 369 | o 2:b1661037fa25 added b
351 |/ () draft 370 |/ () draft