Commits

Pierre-Yves David committed 9300f48

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.

Comments (0)

Files changed (3)

tests/test-obsolete.t

 #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''
   |

tests/test-stabilize-result.t

 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
 

tests/test-tutorial.t

   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
   |
 
   $ 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