Mercurial > evolve
changeset 1606:c2739551ea4e mercurial-3.5
merge with stable through 3.6
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 11 Feb 2016 00:07:54 +0000 |
| parents | 0d8973818980 (diff) 61dd08f4dc62 (current diff) |
| children | e359d33856c3 dd6f090b7342 |
| files | hgext/directaccess.py hgext/inhibit.py tests/dummyssh tests/killdaemons.py tests/run-tests.py tests/test-evolve.t tests/test-inhibit.t tests/test-split.t tests/test-touch.t |
| diffstat | 5 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Wed Feb 10 23:44:00 2016 +0000 +++ b/tests/test-evolve.t Thu Feb 11 00:07:54 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] @@ -1424,7 +1425,8 @@ move:[39] will cause conflict at evolve atop:[42] will be evolved safely merging newfile - warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') + warning: conflicts during merge. + merging newfile 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-split.t Wed Feb 10 23:44:00 2016 +0000 +++ b/tests/test-split.t Thu Feb 11 00:07:54 2016 +0000 @@ -336,6 +336,7 @@ > evolution=createmarkers > evolutioncommands=split > EOF + $ hg up -qC tip $ hg split -r "desc(split3)" abort: cannot split commit: ced8fbcce3a7 not a head [255] @@ -345,6 +346,7 @@ $ echo "evolution=createmarkers" >> $HGRCPATH Running split without any revision operates on the parent of the working copy + $ hg up -qC tip $ hg split << EOF > q > EOF @@ -358,6 +360,7 @@ [255] Running split with tip revision, specified as unnamed argument + $ hg up -qC tip $ hg split . << EOF > q > EOF
--- a/tests/test-stabilize-conflict.t Wed Feb 10 23:44:00 2016 +0000 +++ b/tests/test-stabilize-conflict.t Thu Feb 11 00:07:54 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 Wed Feb 10 23:44:00 2016 +0000 +++ b/tests/test-stabilize-result.t Thu Feb 11 00:07:54 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)
--- a/tests/test-touch.t Wed Feb 10 23:44:00 2016 +0000 +++ b/tests/test-touch.t Thu Feb 11 00:07:54 2016 +0000 @@ -43,7 +43,7 @@ $ hg touch . [1] a reviving this changeset will create divergence unless you make a duplicate. - (a)llow divergence or (d)uplicate the changeset? a + (a)llow divergence or (d)uplicate the changeset? a 2 new divergent changesets $ hg log -G @ 4:[0-9a-f]{12} a (re)