Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 2834:38db1466c6fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: unstable was renamed into orphan Unstable was renamed into orphan, update tests. Match 03039ff3082b mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Thu, 10 Aug 2017 17:37:31 +0200
parents 08a64770ed24
children 66796d7b5415
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Thu Aug 10 17:31:23 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Thu Aug 10 17:37:31 2017 +0200
@@ -65,7 +65,7 @@
   $ safesed 's/huit/eight/' babar
   $ hg diff
   diff -r 9d5daf8bd956 babar
-  --- a/babar	Thu Jan 01 00:00:00 1970 +0000
+  --- a/babar	* (glob)
   +++ b/babar	* (glob)
   @@ -5,6 +5,6 @@
    cinq
@@ -114,7 +114,7 @@
   $ hg diff
   diff -r 5977072d13c5 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/babar	* (glob)
+  +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
   @@ -7,4 +7,4 @@
    sept
    eight
@@ -145,7 +145,7 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: unstable
+  | |  instability: orphan
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -237,7 +237,7 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: unstable
+  | |  instability: orphan
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6