Mercurial > evolve
comparison tests/test-obsolete.t @ 747:9300f48786de
test: prepare test for core changeset 9c78ed396075
New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse
the original working directory. This break an handfull of test so we
preventively update to tip after rebase.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 15 Nov 2013 18:53:29 -0500 |
parents | 99e51aff724b |
children | ddbea2fdee5e |
comparison
equal
deleted
inserted
replaced
746:fa87604b359c | 747:9300f48786de |
---|---|
500 should not rebase extinct changeset | 500 should not rebase extinct changeset |
501 | 501 |
502 #excluded 'whole rebase set is extinct and ignored.' message not in core | 502 #excluded 'whole rebase set is extinct and ignored.' message not in core |
503 $ hg rebase -b '3' -d 4 --traceback | 503 $ hg rebase -b '3' -d 4 --traceback |
504 2 new divergent changesets | 504 2 new divergent changesets |
505 $ hg up tip | |
506 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) | |
505 $ hg log -G --template='{rev} - {node|short} {desc}\n' | 507 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
506 @ 11 - 9468a5f5d8b2 add obsol_d'' | 508 @ 11 - 9468a5f5d8b2 add obsol_d'' |
507 | | 509 | |
508 o 10 - 2033b4e49474 add obsol_c | 510 o 10 - 2033b4e49474 add obsol_c |
509 | | 511 | |