Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 3930:d00f0c369bc7 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 Thu, 02 Aug 2018 02:47:44 +0200
parents 629558d09898
children 537fd9a86c06 684cc3418ecd
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
93 working directory is now at e93a9161a274 93 working directory is now at e93a9161a274
94 94
95 $ hg glog 95 $ hg glog
96 @ 5:e93a9161a274 added c 96 @ 5:e93a9161a274 added c
97 | () draft 97 | () draft
98 | * 4:c41c793e0ef1 added d 98 | o 4:c41c793e0ef1 added d
99 | | () draft 99 | | () draft
100 | x 3:ca1b80f7960a added c 100 | x 3:ca1b80f7960a added c
101 |/ () draft 101 |/ () draft
102 o 2:b1661037fa25 added b 102 o 2:b1661037fa25 added b
103 | () draft 103 | () draft
169 $ hg glog 169 $ hg glog
170 @ 8:0c41ec482070 added b 170 @ 8:0c41ec482070 added b
171 | () draft 171 | () draft
172 o 7:125af0ed8cae added a 172 o 7:125af0ed8cae added a
173 | () draft 173 | () draft
174 | * 6:e83de241f751 added d 174 | o 6:e83de241f751 added d
175 | | () draft 175 | | () draft
176 | * 5:e93a9161a274 added c 176 | o 5:e93a9161a274 added c
177 | | () draft 177 | | () draft
178 | x 2:b1661037fa25 added b 178 | x 2:b1661037fa25 added b
179 | | () draft 179 | | () draft
180 | x 1:c7586e2a9264 added a 180 | x 1:c7586e2a9264 added a
181 |/ () draft 181 |/ () draft
182 o 0:8fa14d15e168 added hgignore 182 o 0:8fa14d15e168 added hgignore
183 () draft 183 () draft
184 184
185 $ hg evolve --abort 185 $ hg evolve --abort
186 1 new orphan changesets
187 evolve aborted 186 evolve aborted
188 working directory is now at 125af0ed8cae 187 working directory is now at 125af0ed8cae
189 188
190 $ hg glog 189 $ hg glog
191 @ 7:125af0ed8cae added a 190 @ 7:125af0ed8cae added a
192 | () draft 191 | () draft
193 | * 6:e83de241f751 added d 192 | o 6:e83de241f751 added d
194 | | () draft 193 | | () draft
195 | * 5:e93a9161a274 added c 194 | o 5:e93a9161a274 added c
196 | | () draft 195 | | () draft
197 | * 2:b1661037fa25 added b 196 | o 2:b1661037fa25 added b
198 | | () draft 197 | | () draft
199 | x 1:c7586e2a9264 added a 198 | x 1:c7586e2a9264 added a
200 |/ () draft 199 |/ () draft
201 o 0:8fa14d15e168 added hgignore 200 o 0:8fa14d15e168 added hgignore
202 () draft 201 () draft
264 | () draft 263 | () draft
265 | o 8:db3b42ef4da7 added b 264 | o 8:db3b42ef4da7 added b
266 |/ () draft 265 |/ () draft
267 @ 7:807e8e2ca559 added a 266 @ 7:807e8e2ca559 added a
268 | () draft 267 | () draft
269 | * 6:8f20d4390c21 foo to a 268 | o 6:8f20d4390c21 foo to a
270 | | () draft 269 | | () draft
271 | | * 5:bcb1c47f8520 added d 270 | | o 5:bcb1c47f8520 added d
272 | | | () draft 271 | | | () draft
273 | | x 4:86d2603075a3 added c 272 | | x 4:86d2603075a3 added c
274 | |/ () draft 273 | |/ () draft
275 | | * 3:17509928e5bf added c 274 | | o 3:17509928e5bf added c
276 | | | () draft 275 | | | () draft
277 | | x 2:9f0c80a55ddc added b 276 | | x 2:9f0c80a55ddc added b
278 | |/ () draft 277 | |/ () draft
279 | x 1:2f913b0c9220 added a 278 | x 1:2f913b0c9220 added a
280 |/ () draft 279 |/ () draft
281 o 0:8fa14d15e168 added hgignore 280 o 0:8fa14d15e168 added hgignore
282 () draft 281 () draft
283 282
284 $ hg evolve --abort 283 $ hg evolve --abort
285 2 new orphan changesets
286 evolve aborted 284 evolve aborted
287 working directory is now at 807e8e2ca559 285 working directory is now at 807e8e2ca559
288 286
289 $ hg glog 287 $ hg glog
290 @ 7:807e8e2ca559 added a 288 @ 7:807e8e2ca559 added a
291 | () draft 289 | () draft
292 | * 6:8f20d4390c21 foo to a 290 | o 6:8f20d4390c21 foo to a
293 | | () draft 291 | | () draft
294 | | * 5:bcb1c47f8520 added d 292 | | o 5:bcb1c47f8520 added d
295 | | | () draft 293 | | | () draft
296 | | * 4:86d2603075a3 added c 294 | | o 4:86d2603075a3 added c
297 | |/ () draft 295 | |/ () draft
298 | | * 3:17509928e5bf added c 296 | | o 3:17509928e5bf added c
299 | | | () draft 297 | | | () draft
300 | | * 2:9f0c80a55ddc added b 298 | | o 2:9f0c80a55ddc added b
301 | |/ () draft 299 | |/ () draft
302 | x 1:2f913b0c9220 added a 300 | x 1:2f913b0c9220 added a
303 |/ () draft 301 |/ () draft
304 o 0:8fa14d15e168 added hgignore 302 o 0:8fa14d15e168 added hgignore
305 () draft 303 () draft
327 | () draft 325 | () draft
328 | o 8:db3b42ef4da7 added b 326 | o 8:db3b42ef4da7 added b
329 |/ () draft 327 |/ () draft
330 @ 7:807e8e2ca559 added a 328 @ 7:807e8e2ca559 added a
331 | () draft 329 | () draft
332 | * 6:8f20d4390c21 foo to a 330 | o 6:8f20d4390c21 foo to a
333 | | () draft 331 | | () draft
334 | | * 5:bcb1c47f8520 added d 332 | | o 5:bcb1c47f8520 added d
335 | | | () draft 333 | | | () draft
336 | | x 4:86d2603075a3 added c 334 | | x 4:86d2603075a3 added c
337 | |/ () draft 335 | |/ () draft
338 | | * 3:17509928e5bf added c 336 | | o 3:17509928e5bf added c
339 | | | () draft 337 | | | () draft
340 | | x 2:9f0c80a55ddc added b 338 | | x 2:9f0c80a55ddc added b
341 | |/ () draft 339 | |/ () draft
342 | x 1:2f913b0c9220 added a 340 | x 1:2f913b0c9220 added a
343 |/ () draft 341 |/ () draft
358 adding changesets 356 adding changesets
359 adding manifests 357 adding manifests
360 adding file changes 358 adding file changes
361 added 10 changesets with 8 changes to 5 files (+4 heads) 359 added 10 changesets with 8 changes to 5 files (+4 heads)
362 3 new obsolescence markers 360 3 new obsolescence markers
363 3 new orphan changesets
364 $ cd ../clonerepo 361 $ cd ../clonerepo
365 $ hg up 7f8e8bd9f0b6 362 $ hg up 7f8e8bd9f0b6
366 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 363 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
367 $ echo bar > bar 364 $ echo bar > bar
368 $ hg add bar 365 $ hg add bar
411 | | () draft 408 | | () draft
412 | o 8:db3b42ef4da7 added b 409 | o 8:db3b42ef4da7 added b
413 |/ () draft 410 |/ () draft
414 @ 7:807e8e2ca559 added a 411 @ 7:807e8e2ca559 added a
415 | () draft 412 | () draft
416 | * 6:8f20d4390c21 foo to a 413 | o 6:8f20d4390c21 foo to a
417 | | () draft 414 | | () draft
418 | x 1:2f913b0c9220 added a 415 | x 1:2f913b0c9220 added a
419 |/ () draft 416 |/ () draft
420 o 0:8fa14d15e168 added hgignore 417 o 0:8fa14d15e168 added hgignore
421 () draft 418 () draft
455 2 new orphan changesets 452 2 new orphan changesets
456 453
457 $ hg glog 454 $ hg glog
458 @ 4:a0086c17bfc7 added a 455 @ 4:a0086c17bfc7 added a
459 | () draft 456 | () draft
460 | * 3:17509928e5bf added c 457 | o 3:17509928e5bf added c
461 | | () draft 458 | | () draft
462 | * 2:9f0c80a55ddc added b 459 | o 2:9f0c80a55ddc added b
463 | | (bm1) draft 460 | | (bm1) draft
464 | x 1:2f913b0c9220 added a 461 | x 1:2f913b0c9220 added a
465 |/ () draft 462 |/ () draft
466 o 0:8fa14d15e168 added hgignore 463 o 0:8fa14d15e168 added hgignore
467 () draft 464 () draft
479 $ hg glog 476 $ hg glog
480 @ 5:c1f4718020e3 added b 477 @ 5:c1f4718020e3 added b
481 | (bm1) draft 478 | (bm1) draft
482 o 4:a0086c17bfc7 added a 479 o 4:a0086c17bfc7 added a
483 | () draft 480 | () draft
484 | * 3:17509928e5bf added c 481 | o 3:17509928e5bf added c
485 | | () draft 482 | | () draft
486 | x 2:9f0c80a55ddc added b 483 | x 2:9f0c80a55ddc added b
487 | | () draft 484 | | () draft
488 | x 1:2f913b0c9220 added a 485 | x 1:2f913b0c9220 added a
489 |/ () draft 486 |/ () draft
490 o 0:8fa14d15e168 added hgignore 487 o 0:8fa14d15e168 added hgignore
491 () draft 488 () draft
492 489
493 $ hg evolve --abort 490 $ hg evolve --abort
494 1 new orphan changesets
495 evolve aborted 491 evolve aborted
496 working directory is now at a0086c17bfc7 492 working directory is now at a0086c17bfc7
497 493
498 $ hg glog 494 $ hg glog
499 @ 4:a0086c17bfc7 added a 495 @ 4:a0086c17bfc7 added a
500 | () draft 496 | () draft
501 | * 3:17509928e5bf added c 497 | o 3:17509928e5bf added c
502 | | () draft 498 | | () draft
503 | * 2:9f0c80a55ddc added b 499 | o 2:9f0c80a55ddc added b
504 | | (bm1) draft 500 | | (bm1) draft
505 | x 1:2f913b0c9220 added a 501 | x 1:2f913b0c9220 added a
506 |/ () draft 502 |/ () draft
507 o 0:8fa14d15e168 added hgignore 503 o 0:8fa14d15e168 added hgignore
508 () draft 504 () draft