Patchwork [evolve_ext] test-obsolete: clarify the situation a bit when we have divergent changesets

login
register
mail settings
Submitter Greg Ward
Date June 21, 2014, 10:33 p.m.
Message ID <db4f29a727ccd2d5ac7d.1403389997@lucifer.gerg.ca>
Download mbox | patch
Permalink /patch/5036/
State Changes Requested
Headers show

Comments

Greg Ward - June 21, 2014, 10:33 p.m.
# HG changeset patch
# User Greg Ward <greg@gerg.ca>
# Date 1403378573 14400
#      Sat Jun 21 15:22:53 2014 -0400
# Node ID db4f29a727ccd2d5ac7d7383ab4912ad75ae55cc
# Parent  57375bce4934cb7a753360eeb23aeb6e763d2983
test-obsolete: clarify the situation a bit when we have divergent changesets

- add {desc} to pre-divergence log output (helps when comparing pre
  and post)
- show which changesets are divergent (ie. which obsolete changeset
  has multiple successors)

Patch

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -495,26 +495,26 @@ 
   o  0 - 1f0dee641bb7 add a
   
 
-  $ hg log -G  --template='{rev} - {node|short}\n' --hidden
-  x  9 - 83b5778897ad
+  $ hg log -G  --template='{rev} - {node|short} {desc}\n' --hidden
+  x  9 - 83b5778897ad add toto
   
-  o  8 - 159dfc9fa5d3
+  o  8 - 159dfc9fa5d3 add obsol_d''
   |
-  | x  7 - 909a0fb57e5d
+  | x  7 - 909a0fb57e5d add obsol_d'
   |/
-  | x  6 - 95de7fc6918d
+  | x  6 - 95de7fc6918d add obsol_d
   |/
-  | x  5 - a7a6f2b5d8a5
+  | x  5 - a7a6f2b5d8a5 add d
   |/
-  | o  4 - 725c380fe99b
+  | o  4 - 725c380fe99b add obsol_c'
   | |
-  x |  3 - 0d3f46688ccc
+  x |  3 - 0d3f46688ccc add obsol_c
   |/
-  | x  2 - 4538525df7e2
+  | x  2 - 4538525df7e2 add c
   |/
-  o  1 - 7c3bad9141dc
+  o  1 - 7c3bad9141dc add b
   |
-  o  0 - 1f0dee641bb7
+  o  0 - 1f0dee641bb7 add a
   
 
 should not rebase extinct changesets
@@ -522,6 +522,9 @@ 
 #excluded 'whole rebase set is extinct and ignored.' message not in core
   $ hg rebase -b '3' -d 4 --traceback
   2 new divergent changesets
+  $ hg --hidden log -q -r 'successors(3)'
+  4:725c380fe99b
+  10:2033b4e49474
   $ hg up tip
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg log -G --template='{rev} - {node|short} {desc}\n'