Mercurial > hg > evolve
changeset 1696:0d8973818980 mercurial-3.5
tests: register expected difference for Mercurial 3.5
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 04 Feb 2016 11:07:44 +0000 |
| parents | dcf145d0ce21 |
| children | c2739551ea4e |
| files | tests/test-evolve.t tests/test-inhibit.t tests/test-stabilize-conflict.t tests/test-stabilize-result.t |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -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 +++ b/tests/test-inhibit.t @@ -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 +++ b/tests/test-stabilize-conflict.t @@ -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 +++ b/tests/test-stabilize-result.t @@ -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)