Mercurial > evolve
changeset 1396:ba95cec18fe9
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 19 Jun 2015 10:47:02 -0700 |
| parents | 35518d26b549 (current diff) 362e2c8c5677 (diff) |
| children | 35f2f54b557c |
| files | hgext/evolve.py tests/test-stabilize-result.t |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Thu Jun 18 23:45:37 2015 -0700 +++ b/hgext/evolve.py Fri Jun 19 10:47:02 2015 -0700 @@ -20,7 +20,7 @@ ''' __version__ = '5.1.4' -testedwith = '3.3.3 3.4-rc' +testedwith = '3.3.3 3.4.1' buglink = 'http://bz.selenic.com/' import sys, os @@ -1541,7 +1541,8 @@ repo.opener.write('graftstate', orig.hex() + '\n') repo.ui.write_err(_('evolve failed!\n')) repo.ui.write_err( - _('fix conflict and run "hg evolve --continue"\n')) + _('fix conflict and run "hg evolve --continue"' + ' or use "hg update -C" to abort\n')) raise def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
--- a/tests/test-stabilize-conflict.t Thu Jun 18 23:45:37 2015 -0700 +++ b/tests/test-stabilize-conflict.t Fri Jun 19 10:47:02 2015 -0700 @@ -130,7 +130,7 @@ warning: conflicts during merge. merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') evolve failed! - fix conflict and run "hg evolve --continue" + fix conflict and run "hg evolve --continue" or use "hg update -C" to abort abort: unresolved merge conflicts (see hg help resolve) [255] $ hg resolve -l @@ -220,7 +220,7 @@ was merge successful (yn)? n merging babar failed! evolve failed! - fix conflict and run "hg evolve --continue" + fix conflict and run "hg evolve --continue" or use "hg update -C" to abort abort: unresolved merge conflicts (see hg help resolve) [255] $ hg resolve -l
--- a/tests/test-stabilize-result.t Thu Jun 18 23:45:37 2015 -0700 +++ b/tests/test-stabilize-result.t Fri Jun 19 10:47:02 2015 -0700 @@ -85,7 +85,7 @@ warning: conflicts during merge. merging a incomplete! (edit conflicts, then use 'hg resolve --mark') evolve failed! - fix conflict and run "hg evolve --continue" + fix conflict and run "hg evolve --continue" or use "hg update -C" to abort abort: unresolved merge conflicts (see hg help resolve) [255] $ hg revert -r 'unstable()' a