equal
deleted
inserted
replaced
65 rebasing 3:3163e20567cc "L1" |
65 rebasing 3:3163e20567cc "L1" |
66 rebasing 4:46f0b057b5c0 "L2" |
66 rebasing 4:46f0b057b5c0 "L2" |
67 merging common |
67 merging common |
68 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
68 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
69 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
69 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
70 [1] |
70 [240] |
71 |
71 |
72 $ hg status --config commands.status.verbose=1 |
72 $ hg status --config commands.status.verbose=1 |
73 M common |
73 M common |
74 ? common.orig |
74 ? common.orig |
75 # The repository is in an unfinished *rebase* state. |
75 # The repository is in an unfinished *rebase* state. |
343 $ hg rebase -s 7bc217434fc1 -d ab --keep |
343 $ hg rebase -s 7bc217434fc1 -d ab --keep |
344 rebasing 13:7bc217434fc1 tip "abc" |
344 rebasing 13:7bc217434fc1 tip "abc" |
345 merging a |
345 merging a |
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
347 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
347 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
348 [1] |
348 [240] |
349 $ hg diff |
349 $ hg diff |
350 diff -r 328e4ab1f7cc a |
350 diff -r 328e4ab1f7cc a |
351 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
351 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
352 +++ b/a * (glob) |
352 +++ b/a * (glob) |
353 @@ -1,2 +1,6 @@ |
353 @@ -1,2 +1,6 @@ |
363 $ hg rebase -s . -d ab --keep -t internal:merge3 |
363 $ hg rebase -s . -d ab --keep -t internal:merge3 |
364 rebasing 13:7bc217434fc1 tip "abc" |
364 rebasing 13:7bc217434fc1 tip "abc" |
365 merging a |
365 merging a |
366 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
366 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
367 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
367 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
368 [1] |
368 [240] |
369 $ hg diff |
369 $ hg diff |
370 diff -r 328e4ab1f7cc a |
370 diff -r 328e4ab1f7cc a |
371 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
371 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
372 +++ b/a * (glob) |
372 +++ b/a * (glob) |
373 @@ -1,2 +1,8 @@ |
373 @@ -1,2 +1,8 @@ |
401 $ hg rebase -r B+D -d . --config experimental.evolution=true |
401 $ hg rebase -r B+D -d . --config experimental.evolution=true |
402 rebasing 1:112478962961 B "B" |
402 rebasing 1:112478962961 B "B" |
403 merging B |
403 merging B |
404 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
404 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
405 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
405 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
406 [1] |
406 [240] |
407 |
407 |
408 $ echo 4 > B |
408 $ echo 4 > B |
409 $ hg resolve -m |
409 $ hg resolve -m |
410 (no more unresolved files) |
410 (no more unresolved files) |
411 continue: hg rebase --continue |
411 continue: hg rebase --continue |
453 rebasing 4:03ca77807e91 E "E" |
453 rebasing 4:03ca77807e91 E "E" |
454 rebasing 5:9a6b91dc2044 F tip "F" |
454 rebasing 5:9a6b91dc2044 F tip "F" |
455 merging conflict |
455 merging conflict |
456 warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
456 warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
457 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
457 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
458 [1] |
458 [240] |
459 $ hg tglog |
459 $ hg tglog |
460 @ 8:draft 'E' |
460 @ 8:draft 'E' |
461 | |
461 | |
462 | @ 7:draft 'D' |
462 | @ 7:draft 'D' |
463 |/ |
463 |/ |