comparison tests/test-obsolete.t @ 989:33096d7d094b

test-obsolete: explicitly show which changesets are divergent
author Greg Ward <greg@gerg.ca>
date Mon, 23 Jun 2014 21:03:57 -0400
parents b286f77d680c
children c863269aed01
comparison
equal deleted inserted replaced
988:85d213215d2c 989:33096d7d094b
520 should not rebase extinct changesets 520 should not rebase extinct changesets
521 521
522 #excluded 'whole rebase set is extinct and ignored.' message not in core 522 #excluded 'whole rebase set is extinct and ignored.' message not in core
523 $ hg rebase -b '3' -d 4 --traceback 523 $ hg rebase -b '3' -d 4 --traceback
524 2 new divergent changesets 524 2 new divergent changesets
525 $ hg --hidden log -q -r 'successors(3)'
526 4:725c380fe99b
527 10:2033b4e49474
525 $ hg up tip 528 $ hg up tip
526 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) 529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
527 $ hg log -G --template='{rev} - {node|short} {desc}\n' 530 $ hg log -G --template='{rev} - {node|short} {desc}\n'
528 @ 11 - 9468a5f5d8b2 add obsol_d'' 531 @ 11 - 9468a5f5d8b2 add obsol_d''
529 | 532 |