Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-interruptions.t @ 19478:e5a5790a3185 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add checkunfinished support (issue3955)
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Jul 2013 23:51:44 -0500
parents e5d9441ec281
children eab2ff59481e
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t	Wed Jul 24 23:51:44 2013 -0500
+++ b/tests/test-rebase-interruptions.t	Wed Jul 24 23:51:44 2013 -0500
@@ -66,11 +66,11 @@
 
 Force a commit on C during the interruption:
 
-  $ hg up -q -C 2
+  $ hg up -q -C 2 --config 'extensions.rebase=!'
 
   $ echo 'Extra' > Extra
   $ hg add Extra
-  $ hg ci -m 'Extra'
+  $ hg ci -m 'Extra' --config 'extensions.rebase=!'
 
 Force this commit onto secret phase
 
@@ -156,11 +156,11 @@
 
 Force a commit on B' during the interruption:
 
-  $ hg up -q -C 5
+  $ hg up -q -C 5 --config 'extensions.rebase=!'
 
   $ echo 'Extra' > Extra
   $ hg add Extra
-  $ hg ci -m 'Extra'
+  $ hg ci -m 'Extra' --config 'extensions.rebase=!'
 
   $ hg tglog
   @  6: 'Extra'
@@ -227,7 +227,7 @@
 
 Change phase on B and B'
 
-  $ hg up -q -C 5
+  $ hg up -q -C 5 --config 'extensions.rebase=!'
   $ hg phase --public 1
   $ hg phase --public 5
   $ hg phase --secret -f 2