Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: register expected difference for Mercurial 3.5 mercurial-3.5
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 04 Feb 2016 11:07:44 +0000
branchmercurial-3.5
changeset 1600 0d8973818980
parent 1599 dcf145d0ce21
child 1606 c2739551ea4e
tests: register expected difference for Mercurial 3.5
tests/test-evolve.t file | annotate | diff | comparison | revisions
tests/test-inhibit.t file | annotate | diff | comparison | revisions
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-evolve.t	Thu Feb 04 11:07:44 2016 +0000
@@ -592,7 +592,8 @@
   $ hg graft -O 7
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   merging 1
-  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
--- a/tests/test-inhibit.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-inhibit.t	Thu Feb 04 11:07:44 2016 +0000
@@ -411,7 +411,8 @@
   [255]
   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff
   Warning: accessing hidden changesets 2db36d8066ff for write operation
-  Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
+  Warning: accessing hidden changesets ad78ff7d621f for write operation
+  Warning: accessing hidden changesets 53a94305e133 for write operation
   rebasing 10:ad78ff7d621f "add cK"
   rebasing 11:53a94305e133 "add cL"
   $ hg log -G
--- a/tests/test-stabilize-conflict.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-conflict.t	Thu Feb 04 11:07:44 2016 +0000
@@ -127,7 +127,8 @@
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
   merging babar
-  warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
--- a/tests/test-stabilize-result.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-result.t	Thu Feb 04 11:07:44 2016 +0000
@@ -82,7 +82,8 @@
   move:[5] newer a
   atop:[7] changea
   merging a
-  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
@@ -357,7 +358,8 @@
   with: [21] More addition
   base: [15] More addition
   merging a
-  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   abort: merge conflict between several amendments (this is not automated yet)
evolve