Mercurial > evolve

changeset 2318:523855eb28c1 mercurial-4.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with future 6.1.0 In addition to the output reverted for 4.1, we also drop the "troubles:" entry from the standard log.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 03 May 2017 13:18:08 +0200
parents 7263463ae79a (current diff) 2db189baf8b7 (diff)
children ee321b87c548 765b2561fa90
files tests/test-evolve-obshistory.t tests/test-obsolete.t
diffstat 5 files changed, 0 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Wed May 03 13:18:08 2017 +0200
@@ -483,14 +483,12 @@
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
--- a/tests/test-obsolete.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-obsolete.t	Wed May 03 13:18:08 2017 +0200
@@ -580,7 +580,6 @@
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     bumped
   summary:     add obsol_d'''
   
   $ hg push ../other-new/
@@ -610,7 +609,6 @@
   |/   parent:      10:2033b4e49474
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     bumped
   |    summary:     add obsol_d'''
   |
   | o  changeset:   11:9468a5f5d8b2
@@ -674,7 +672,6 @@
   parent:      10:2033b4e49474
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     bumped, divergent
   summary:     add obsol_d'''
   
   changeset:   16:50f11e5e3a63
@@ -682,7 +679,6 @@
   parent:      11:9468a5f5d8b2
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     divergent
   summary:     add obsolet_conflicting_d
   
 
@@ -720,14 +716,12 @@
   |  parent:      2:4538525df7e2
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     unstable
   |  summary:     add obsol_d''
   |
   | o  changeset:   16:50f11e5e3a63
   | |  parent:      11:9468a5f5d8b2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     divergent
   | |  summary:     add obsolet_conflicting_d
   | |
   | | o  changeset:   15:705ab2a6b72e
@@ -751,7 +745,6 @@
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    trouble:     bumped, divergent
   | | |    summary:     add obsol_d'''
   | | |
   | o |  changeset:   11:9468a5f5d8b2
--- a/tests/test-stabilize-conflict.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Wed May 03 13:18:08 2017 +0200
@@ -145,7 +145,6 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -236,7 +235,6 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6
--- a/tests/test-stabilize-order.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-stabilize-order.t	Wed May 03 13:18:08 2017 +0200
@@ -209,13 +209,11 @@
   | |  parent:      12:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     secondambiguous
   | |
   | | o  changeset:   13:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    trouble:     unstable
   | |    summary:     firstambiguous
   | |
   | x  changeset:   12:2256dae6521f
--- a/tests/test-topic.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-topic.t	Wed May 03 13:18:08 2017 +0200
@@ -566,7 +566,6 @@
   | @  changeset:   10:4073470c35e1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fran?
   | |
 
@@ -592,7 +591,6 @@
   | @  changeset:   12:d9e32f4c4806
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     fran?
   | |