equal
deleted
inserted
replaced
18 this feature, |
18 this feature, |
19 - improves some aspect of the early implementation in Mercurial core |
19 - improves some aspect of the early implementation in Mercurial core |
20 ''' |
20 ''' |
21 |
21 |
22 __version__ = '5.1.4' |
22 __version__ = '5.1.4' |
23 testedwith = '3.3.3 3.4-rc' |
23 testedwith = '3.3.3 3.4.1' |
24 buglink = 'http://bz.selenic.com/' |
24 buglink = 'http://bz.selenic.com/' |
25 |
25 |
26 import sys, os |
26 import sys, os |
27 import random |
27 import random |
28 from StringIO import StringIO |
28 from StringIO import StringIO |
1539 relocate(repo, orig, target, keepbranch) |
1539 relocate(repo, orig, target, keepbranch) |
1540 except MergeFailure: |
1540 except MergeFailure: |
1541 repo.opener.write('graftstate', orig.hex() + '\n') |
1541 repo.opener.write('graftstate', orig.hex() + '\n') |
1542 repo.ui.write_err(_('evolve failed!\n')) |
1542 repo.ui.write_err(_('evolve failed!\n')) |
1543 repo.ui.write_err( |
1543 repo.ui.write_err( |
1544 _('fix conflict and run "hg evolve --continue"\n')) |
1544 _('fix conflict and run "hg evolve --continue"' |
|
1545 ' or use "hg update -C" to abort\n')) |
1545 raise |
1546 raise |
1546 |
1547 |
1547 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False, |
1548 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False, |
1548 progresscb=None): |
1549 progresscb=None): |
1549 """Stabilize a bumped changeset""" |
1550 """Stabilize a bumped changeset""" |