equal
deleted
inserted
replaced
374 add obsol_c' |
374 add obsol_c' |
375 branch: default |
375 branch: default |
376 commit: 1 deleted, 2 unknown (clean) |
376 commit: 1 deleted, 2 unknown (clean) |
377 update: 4 new changesets, 4 branch heads (merge) |
377 update: 4 new changesets, 4 branch heads (merge) |
378 unstable: 1 changesets |
378 unstable: 1 changesets |
379 conflicting: 1 changesets |
379 divergent: 1 changesets |
380 $ qlog |
380 $ qlog |
381 6 |
381 6 |
382 - 909a0fb57e5d |
382 - 909a0fb57e5d |
383 3 |
383 3 |
384 - 725c380fe99b |
384 - 725c380fe99b |
495 |
495 |
496 #excluded 'whole rebase set is extinct and ignored.' message not in core |
496 #excluded 'whole rebase set is extinct and ignored.' message not in core |
497 $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' |
497 $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' |
498 nothing to rebase |
498 nothing to rebase |
499 $ hg rebase -b '3' -d 4 --traceback |
499 $ hg rebase -b '3' -d 4 --traceback |
500 2 new conflicting changesets |
500 2 new divergent changesets |
501 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
501 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
502 @ 11 - 9468a5f5d8b2 add obsol_d'' |
502 @ 11 - 9468a5f5d8b2 add obsol_d'' |
503 | |
503 | |
504 o 10 - 2033b4e49474 add obsol_c |
504 o 10 - 2033b4e49474 add obsol_c |
505 | |
505 | |