changeset 280:fd43e3908f09

test-obsolete-rebase.t: move --keep test from test-obsolete.t
author Patrick Mezard <patrick@mezard.eu>
date Tue, 19 Jun 2012 14:02:12 +0200
parents 0d87b1fbf32b
children 258169d3428b
files tests/test-obsolete-rebase.t tests/test-obsolete.t
diffstat 2 files changed, 4 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-obsolete-rebase.t	Tue Jun 19 18:02:34 2012 +0200
+++ b/tests/test-obsolete-rebase.t	Tue Jun 19 14:02:12 2012 +0200
@@ -28,6 +28,10 @@
   $ hg ci -Am addb
   adding b
   created new head
+  $ hg rebase -d 1 --keep  
+  abort: rebase --keep option is unsupported with obsolete extension
+  (see 'hg help obsolete')
+  [255]
   $ hg rebase -d 1
   $ glog --hidden
   @  3:03f017c74faa@default(draft) addb
--- a/tests/test-obsolete.t	Tue Jun 19 18:02:34 2012 +0200
+++ b/tests/test-obsolete.t	Tue Jun 19 14:02:12 2012 +0200
@@ -454,27 +454,3 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   $ cd ..
-
-
-Test compatibility with other extensions
-
-  $ hg init compat
-  $ cd compat
-  $ echo a > a
-  $ hg ci -Am adda
-  adding a
-  $ echo a >> a
-  $ hg ci -m changea
-  $ hg up 0
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo b > b
-  $ hg ci -Am addb
-  adding b
-  created new head
-
-Test rebase --keep warning
-
-  $ hg --config extensions.rebase= rebase -d 1 --keep
-  abort: rebase --keep option is unsupported with obsolete extension
-  (see 'hg help obsolete')
-  [255]