Mercurial > evolve
changeset 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 | fa87604b359c |
| children | 4979ef2c0900 |
| files | tests/test-obsolete.t tests/test-stabilize-result.t tests/test-tutorial.t |
| diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete.t Fri Nov 15 16:01:40 2013 -0500 +++ b/tests/test-obsolete.t Fri Nov 15 18:53:29 2013 -0500 @@ -502,6 +502,8 @@ #excluded 'whole rebase set is extinct and ignored.' message not in core $ hg rebase -b '3' -d 4 --traceback 2 new divergent changesets + $ hg up tip + ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G --template='{rev} - {node|short} {desc}\n' @ 11 - 9468a5f5d8b2 add obsol_d'' |
--- a/tests/test-stabilize-result.t Fri Nov 15 16:01:40 2013 -0500 +++ b/tests/test-stabilize-result.t Fri Nov 15 18:53:29 2013 -0500 @@ -121,6 +121,8 @@ Get a successors of 8 on it $ hg grab 8 + $ hg update tip + ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) Add real change to the successors
--- a/tests/test-tutorial.t Fri Nov 15 16:01:40 2013 -0500 +++ b/tests/test-tutorial.t Fri Nov 15 18:53:29 2013 -0500 @@ -343,6 +343,8 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase --rev fac207dec9f5 --dest . # moving "SPAM SPAM" to the working directory parent merging shopping + $ hg up tip + ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G @ a224f2a4fb9f (draft): SPAM SPAM | @@ -401,6 +403,8 @@ $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f merging shopping + $ hg up tip + ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg phase --draft . $ hg log -G @ 75954b8cd933 (draft): bathroom stuff