Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-result.t
branchmercurial-4.2
changeset 3592 7a5c3175015e
parent 3591 98941c28f3e2 
--- a/tests/test-stabilize-result.t	Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-stabilize-result.t	Wed Mar 21 16:32:54 2018 +0100
@@ -54,7 +54,7 @@
   $ hg debugobsolete
   102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
-  cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
 
 Test evolve with conflict
 
@@ -63,8 +63,8 @@
   b
   $ hg pdiff a
   diff -r 07f494440405 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
+  --- a/a	* (glob)
+  +++ b/a	* (glob)
   @@ -1,1 +1,2 @@
    a
   +a
@@ -89,8 +89,8 @@
   $ hg revert -r "orphan()" a
   $ hg diff
   diff -r 66719795a494 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
+  --- a/a	* (glob)
+  +++ b/a	* (glob)
   @@ -1,1 +1,3 @@
    a
   +a
evolve