[PATCH 2 of 2] test-obsolete: make log templates more consistent: add {desc} to one

Greg Ward greg at gerg.ca
Mon Jun 23 21:05:40 CDT 2014


# HG changeset patch
# User Greg Ward <greg at gerg.ca>
# Date 1403575472 14400
#      Mon Jun 23 22:04:32 2014 -0400
# Node ID 9e51c1da06c8b4d9e1dcbe16535e30c953c85339
# Parent  374720e271cc6b9bae878bc05dd6e2cd3ffa7af1
test-obsolete: make log templates more consistent: add {desc} to one

This has the extra added benefit of making the divergence situation
easier to understand.

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


More information about the Mercurial-devel mailing list