Mercurial > evolve

changeset 1875:9eba8561870b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-topic-dest: test fixes I should have put in the previous change I split a bigger change from marmoute that included some rebase support that I wanted to discuss more, but I didn't correctly commit my fixes to the tests before pushing. Oops.
author Augie Fackler <raf@durin42.com>
date Fri, 11 Dec 2015 13:09:29 -0500
parents 58ef5699fb35
children 594ca2f3d1de
files tests/test-topic-dest.t
diffstat 1 files changed, 25 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-topic-dest.t	Wed Oct 21 01:09:15 2015 +0200
+++ b/tests/test-topic-dest.t	Fri Dec 11 13:09:29 2015 -0500
@@ -95,38 +95,37 @@
 =================
 
   $ hg up 'ngtip(default)'
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo zeta >> zeta
   $ hg add zeta
   $ hg ci -m "c_zeta"
-  created new head
   $ hg log -G
-  @  9 () c_zeta
+  @  7 () c_zeta
   |
-  | o  8 (monkey) zephir
-  |/
-  | o  7 (elephant) babar
-  |/
   o  6 () c_epsilon
   |
-  o  3 () c_delta
-  |
-  o  2 () c_gamma
-  |
+  | o  5 (monkey) zephir
+  | |
+  +---o  4 (elephant) babar
+  | |
+  o |  3 () c_delta
+  | |
+  o |  2 () c_gamma
+  |/
   o  1 () c_beta
   |
   o  0 () c_alpha
   
   $ hg up elephant
   switching to topic elephant
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg rebase # make sure tip is elsewhere
-  rebasing 7:8d0b77140b05 "babar"
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg rebase -d 7 # make sure tip is elsewhere
+  rebasing 4:cb7ae72f4a80 "babar"
   $ hg up monkey
   switching to topic monkey
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg topic
      elephant
@@ -136,20 +135,20 @@
      elephant
    * monkey
   $ hg log -G
-  @    11 (monkey) merge with default
+  @    9 (monkey) merge with default
   |\
-  | | o  10 (elephant) babar
+  | | o  8 (elephant) babar
   | |/
-  | o  9 () c_zeta
+  | o  7 () c_zeta
   | |
-  o |  8 (monkey) zephir
+  | o  6 () c_epsilon
+  | |
+  o |  5 (monkey) zephir
+  | |
+  | o  3 () c_delta
+  | |
+  | o  2 () c_gamma
   |/
-  o  6 () c_epsilon
-  |
-  o  3 () c_delta
-  |
-  o  2 () c_gamma
-  |
   o  1 () c_beta
   |
   o  0 () c_alpha