tests: simplify test-rebase-named-branches
authorNicolas Dumazet <nicdumz.commits@gmail.com>
Sat, 30 Apr 2011 17:38:06 +0200
changeset 14120 d7f80dbbaf49
parent 14119 624e5ce615ec
child 14121 012c719103ab
tests: simplify test-rebase-named-branches We were cloning a repo to perform a smoke test that could have been performed earlier.
tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t	Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-rebase-named-branches.t	Sat Apr 30 17:38:06 2011 +0200
@@ -54,6 +54,12 @@
   |/
   o  0: 'A'
   
+
+
+  $ hg rebase -s 7 -d 8
+  abort: source is ancestor of destination
+  [255]
+
   $ hg rebase -s 8 -d 7
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
@@ -114,44 +120,3 @@
 
   $ cd ..
  
-Rebasing ancestor onto descendant across different named branches
-
-  $ hg clone -q -u . a a3
-
-  $ cd a3
-
-  $ hg branch dev
-  marked working directory as branch dev
-
-  $ echo x > x
-
-  $ hg add x
-
-  $ hg ci -m 'extra named branch'
-
-  $ hg tglog
-  @  8: 'extra named branch' dev
-  |
-  o  7: 'H'
-  |
-  | o  6: 'G'
-  |/|
-  o |  5: 'F'
-  | |
-  | o  4: 'E'
-  |/
-  | o  3: 'D'
-  | |
-  | o  2: 'C'
-  | |
-  | o  1: 'B'
-  |/
-  o  0: 'A'
-  
-  $ hg rebase -s 7 -d 8
-  abort: source is ancestor of destination
-  [255]
-
-  $ cd ..
- 
-