Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 4676:b6c819facbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Jun 2019 17:37:42 +0800
parents 61c2518cd6d2
children ecf0f3bc7468 2928f35023a1
comparison
equal deleted inserted replaced
4669:daab6d665687 4676:b6c819facbe8
84 with: [5] added d 84 with: [5] added d
85 base: [4] added d 85 base: [4] added d
86 merging d 86 merging d
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
89 fix conflicts and see `hg help evolve.interrupted` 89 unresolved merge conflicts
90 (see 'hg help evolve.interrupted')
90 [1] 91 [1]
91 92
92 $ hg status -v 93 $ hg status -v
93 M d 94 M d
94 # The repository is in an unfinished *evolve* state. 95 # The repository is in an unfinished *evolve* state.
195 with: [7] added d 196 with: [7] added d
196 base: [4] added d 197 base: [4] added d
197 merging d 198 merging d
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 199 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
199 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 200 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
200 fix conflicts and see `hg help evolve.interrupted` 201 unresolved merge conflicts
202 (see 'hg help evolve.interrupted')
201 [1] 203 [1]
202 204
203 $ hg evolve --abort 205 $ hg evolve --abort
204 2 new content-divergent changesets 206 2 new content-divergent changesets
205 evolve aborted 207 evolve aborted
301 with: [6] added d 303 with: [6] added d
302 base: [4] added d 304 base: [4] added d
303 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a 305 rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
304 merging c 306 merging c
305 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 307 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
306 fix conflicts and see `hg help evolve.interrupted` 308 unresolved merge conflicts
309 (see 'hg help evolve.interrupted')
307 [1] 310 [1]
308 311
309 $ hg evolve --abort 312 $ hg evolve --abort
310 evolve aborted 313 evolve aborted
311 working directory is now at e49523854bc8 314 working directory is now at e49523854bc8
354 base: [4] added d 357 base: [4] added d
355 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a 358 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
356 merging d 359 merging d
357 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 360 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
358 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
359 fix conflicts and see `hg help evolve.interrupted` 362 unresolved merge conflicts
363 (see 'hg help evolve.interrupted')
360 [1] 364 [1]
361 365
362 $ hg evolve --abort 366 $ hg evolve --abort
363 evolve aborted 367 evolve aborted
364 working directory is now at 33e4442acf98 368 working directory is now at 33e4442acf98
445 with: [5] added d 449 with: [5] added d
446 base: [4] added d 450 base: [4] added d
447 merging d 451 merging d
448 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 452 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
449 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 453 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
450 fix conflicts and see `hg help evolve.interrupted` 454 unresolved merge conflicts
455 (see 'hg help evolve.interrupted')
451 [1] 456 [1]
452 457
453 $ hg evolve --stop 458 $ hg evolve --stop
454 stopped the interrupted evolve 459 stopped the interrupted evolve
455 working directory is now at 9c1631e352d9 460 working directory is now at 9c1631e352d9
497 base: [4] added d 502 base: [4] added d
498 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a 503 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
499 merging d 504 merging d
500 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 505 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
501 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 506 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
502 fix conflicts and see `hg help evolve.interrupted` 507 unresolved merge conflicts
508 (see 'hg help evolve.interrupted')
503 [1] 509 [1]
504 510
505 $ hg evolve --stop 511 $ hg evolve --stop
506 stopped the interrupted evolve 512 stopped the interrupted evolve
507 working directory is now at 517d4375cb72 513 working directory is now at 517d4375cb72
546 with: [8] added d 552 with: [8] added d
547 base: [4] added d 553 base: [4] added d
548 rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a 554 rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
549 merging c 555 merging c
550 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 556 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
551 fix conflicts and see `hg help evolve.interrupted` 557 unresolved merge conflicts
558 (see 'hg help evolve.interrupted')
552 [1] 559 [1]
553 560
554 $ hg diff 561 $ hg diff
555 diff -r ca1b80f7960a c 562 diff -r ca1b80f7960a c
556 --- a/c Thu Jan 01 00:00:00 1970 +0000 563 --- a/c Thu Jan 01 00:00:00 1970 +0000