This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6504

statecheck: fix for hint message format
AbandonedPublic

Authored by taapas1128 on Jun 8 2019, 4:58 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Summary

This makes two separate message formats for checkunfinished() and
getrepostate() as there were previously present.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 8 2019, 4:58 PM
taapas1128 updated this revision to Diff 15406.Jun 9 2019, 8:53 AM
taapas1128 updated this revision to Diff 15409.Jun 9 2019, 10:48 AM
taapas1128 updated this revision to Diff 15427.Jun 10 2019, 1:55 PM
taapas1128 updated this revision to Diff 15430.Jun 10 2019, 2:33 PM
taapas1128 updated this revision to Diff 15441.Jun 11 2019, 9:48 AM
taapas1128 updated this revision to Diff 15481.Jun 13 2019, 9:19 AM
taapas1128 updated this revision to Diff 15498.Jun 13 2019, 4:44 PM
taapas1128 updated this revision to Diff 15500.Jun 13 2019, 4:51 PM
taapas1128 updated this revision to Diff 15502.Jun 13 2019, 5:42 PM
taapas1128 updated this revision to Diff 15504.Jun 13 2019, 5:45 PM
taapas1128 updated this revision to Diff 15507.Jun 14 2019, 4:34 AM
taapas1128 updated this revision to Diff 15530.Jun 15 2019, 6:40 AM
taapas1128 updated this revision to Diff 15538.Jun 17 2019, 7:37 AM
taapas1128 updated this revision to Diff 15540.Jun 17 2019, 7:54 AM
taapas1128 updated this revision to Diff 15542.Jun 17 2019, 8:06 AM
taapas1128 updated this revision to Diff 15554.Jun 17 2019, 2:09 PM
taapas1128 updated this revision to Diff 15557.Jun 17 2019, 5:30 PM
taapas1128 updated this revision to Diff 15566.Jun 18 2019, 3:47 AM
pulkit added a subscriber: pulkit.Jun 18 2019, 7:21 AM

This changes the old message format used by unfinishedstates
to the format which was used by STATES.

The commit message seems outdated.

Also I think we can fold this one in previous patch so that there are no un-necessary test changes. @martinvonz what do you think?

taapas1128 retitled this revision from statecheck: changed hint message format to statecheck: fix for hint message format.Jun 18 2019, 8:24 AM
taapas1128 edited the summary of this revision. (Show Details)
taapas1128 updated this revision to Diff 15571.
taapas1128 updated this revision to Diff 15585.Jun 18 2019, 1:06 PM
taapas1128 abandoned this revision.Jun 18 2019, 2:42 PM

Revision Contents
Changeset List

Diff 15542

hgext/transplant.py

return n and nodemod.hex(n) or '' return n and nodemod.hex(n) or ''
def extsetup(ui): def extsetup(ui):
transplantdata = { transplantdata = {
'opname': 'transplant', 'opname': 'transplant',
'fname': 'transplant/journal', 'fname': 'transplant/journal',
'clearable': True, 'clearable': True,
'allowcommit': False, 'allowcommit': False,
'cmdhint': _("use 'hg transplant --continue' or 'hg update' to abort") 'cmdhint': _('To continue: hg transplant --continue\n'
'To abort: hg update')
} }
statemod.addunfinished(transplantdata) statemod.addunfinished(transplantdata)
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = [revsettransplanted, kwtransplanted] i18nfunctions = [revsettransplanted, kwtransplanted]

mercurial/state.py

histedit, bisect, update etc and check whether such commands histedit, bisect, update etc and check whether such commands
are in an unfinished conditition of not and return appropriate message are in an unfinished conditition of not and return appropriate message
and hint. and hint.
It also has the ability to register and determine the states of any new It also has the ability to register and determine the states of any new
multistep operation or multistep command extension. multistep operation or multistep command extension.
""" """
def __init__(self, opname, fname, clearable=False, allowcommit=False, def __init__(self, opname, fname, clearable=False, allowcommit=False,
cmdmsg="", cmdhint=""): cmdmsg="", cmdhint="", stopflag=False):
"""opname is the name the command or operation """opname is the name the command or operation
fname is the file name in which data should be stored in .hg directory. fname is the file name in which data should be stored in .hg directory.
It is None for merge command. It is None for merge command.
clearable boolean determines whether or not interrupted states can be clearable boolean determines whether or not interrupted states can be
cleared by running `hg update -C .` which in turn deletes the cleared by running `hg update -C .` which in turn deletes the
state file. state file.
allowcommit boolean decides whether commit is allowed during interrupted allowcommit boolean decides whether commit is allowed during interrupted
state or not. state or not.
cmdmsg is used to pass a different status message in case standard cmdmsg is used to pass a different status message in case standard
message of the format "abort: cmdname in progress" is not desired. message of the format "abort: cmdname in progress" is not desired.
cmdhint is used to pass a different hint message in case standard cmdhint is used to pass a different hint message in case standard
message of the format use 'hg cmdname --continue' or message of the format "To continue: hg cmdname --continue
'hg cmdname --abort'" is not desired. To abort: hg cmdname --abort" is not desired.
stopflag is a boolean that determines whether or not a command supports
--stop flag
""" """
self._opname = opname self._opname = opname
self._fname = fname self._fname = fname
self._clearable = clearable self._clearable = clearable
self._allowcommit = allowcommit self._allowcommit = allowcommit
self._cmdhint = cmdhint self._cmdhint = cmdhint
self._cmdmsg = cmdmsg self._cmdmsg = cmdmsg
self._stopflag = stopflag
def hint(self): def hint(self):
"""returns the hint message corresponding to the command""" """returns the hint message corresponding to the command"""
if not self._cmdhint: if not self._cmdhint:
return (_("use 'hg %s --continue' or 'hg %s --abort'") % hint = (_('To continue: hg %s --continue\n'
(self._opname, self._opname)) 'To abort: hg %s --abort') % (self._opname,
self._opname))
if self._stopflag:
hint = hint + (_('\nTo stop: hg %s --stop') %
(self._opname))
return hint
return self._cmdhint return self._cmdhint
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if not self._cmdmsg: if not self._cmdmsg:
return _('%s in progress') % (self._opname) return _('%s in progress') % (self._opname)
return self._cmdmsg return self._cmdmsg
else: else:
_unfinishedstates.insert(0, statecheckobj) _unfinishedstates.insert(0, statecheckobj)
graftdata = { graftdata = {
'opname': 'graft', 'opname': 'graft',
'fname': 'graftstate', 'fname': 'graftstate',
'clearable': True, 'clearable': True,
'allowcommit': False, 'allowcommit': False,
'cmdhint': _("use 'hg graft --continue' or 'hg graft --stop' to stop") 'stopflag' : True
} }
addunfinished(graftdata) addunfinished(graftdata)
bisectdata = { bisectdata = {
'opname': 'bisect', 'opname': 'bisect',
'fname': 'bisect.state', 'fname': 'bisect.state',
'clearable': False, 'clearable': False,
'allowcommit': True, 'allowcommit': True,
'cmdhint': _('To mark the changeset good: hg bisect --good\n' 'cmdhint': _('To mark the changeset good: hg bisect --good\n'

tests/test-absorb-unfinished.t

rebasing 1:c3b6dc0e177a "foo 2" (tip) rebasing 1:c3b6dc0e177a "foo 2" (tip)
merging foo.whole merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg --config extensions.rebase= absorb $ hg --config extensions.rebase= absorb
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]

tests/test-fix.t

$ hg --config extensions.rebase= fix --working-dir $ hg --config extensions.rebase= fix --working-dir
abort: unresolved conflicts abort: unresolved conflicts
(use 'hg resolve') (use 'hg resolve')
[255] [255]
$ hg --config extensions.rebase= fix -r . $ hg --config extensions.rebase= fix -r .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
When fixing a file that was renamed, we should diff against the source of the When fixing a file that was renamed, we should diff against the source of the
rename for incremental fixing and we should correctly reproduce the rename in rename for incremental fixing and we should correctly reproduce the rename in
the replacement revision. the replacement revision.
$ hg init fixrenamecommit $ hg init fixrenamecommit
$ cd fixrenamecommit $ cd fixrenamecommit

tests/test-graft.t

# The repository is in an unfinished *graft* state. # The repository is in an unfinished *graft* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# e # e
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg graft --continue' or 'hg graft --stop' to stop # To continue: hg graft --continue
# To abort: hg graft --abort
# To stop: hg graft --stop
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress abort: graft in progress
(use 'hg graft --continue' or 'hg graft --stop' to stop) (To continue: hg graft --continue
To abort: hg graft --abort
To stop: hg graft --stop)
[255] [255]
Abort the graft and try committing: Abort the graft and try committing:
$ hg up -C . $ hg up -C .
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> e $ echo c >> e
$ hg ci -mtest $ hg ci -mtest

tests/test-histedit-arguments.t

Editing (6f2f0241f119), you may commit or record as needed now. Editing (6f2f0241f119), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg commit --amend -m 'reject this fold' $ hg commit --amend -m 'reject this fold'
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
With markers enabled, histedit does not get confused, and With markers enabled, histedit does not get confused, and
amend should not be blocked by the ongoing histedit. amend should not be blocked by the ongoing histedit.
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True

tests/test-histedit-edit.t

> EOF > EOF
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
Editing (e860deea161a), you may commit or record as needed now. Editing (e860deea161a), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
try to update and get an error try to update and get an error
$ hg update tip $ hg update tip
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
edit the plan via the editor edit the plan via the editor
$ cat >> $TESTTMP/editplan.sh <<EOF $ cat >> $TESTTMP/editplan.sh <<EOF
> cat > \$1 <<EOF2 > cat > \$1 <<EOF2
> drop e860deea161a e > drop e860deea161a e
> drop 652413bf663e f > drop 652413bf663e f
> drop 3c6a8ed2ebe8 g > drop 3c6a8ed2ebe8 g
strip-backup/177f92b77385-0ebe6a8f-histedit.hg strip-backup/177f92b77385-0ebe6a8f-histedit.hg
Go at a random point and try to continue Go at a random point and try to continue
$ hg id -n $ hg id -n
3+ 3+
$ hg up 0 $ hg up 0
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
Try to delete necessary commit Try to delete necessary commit
$ hg strip -r 652413b $ hg strip -r 652413b
abort: histedit in progress, can't strip 652413bf663e abort: histedit in progress, can't strip 652413bf663e
[255] [255]
commit, then edit the revision commit, then edit the revision
$ hg ci -m 'wat' $ hg ci -m 'wat'
created new head created new head
$ echo a > e $ echo a > e
qnew should fail while we're in the middle of the edit step qnew should fail while we're in the middle of the edit step
$ hg --config extensions.mq= qnew please-fail $ hg --config extensions.mq= qnew please-fail
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
$ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
$ hg log --graph $ hg log --graph
@ changeset: 6:b5f70786f9b0 @ changeset: 6:b5f70786f9b0
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000

tests/test-histedit-fold.t

# The repository is in an unfinished *histedit* state. # The repository is in an unfinished *histedit* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# file # file
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg histedit --continue' or 'hg histedit --abort' # To continue: hg histedit --continue
# To abort: hg histedit --abort
$ hg resolve -l $ hg resolve -l
U file U file
$ hg revert -r 'p1()' file $ hg revert -r 'p1()' file
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --continue $ hg histedit --continue

tests/test-histedit-no-change.t

o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
| |
o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
abort editing session, after first forcibly updating away abort editing session, after first forcibly updating away
$ hg up 0 $ hg up 0
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
$ mv .hg/histedit-state .hg/histedit-state-ignore $ mv .hg/histedit-state .hg/histedit-state-ignore
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ mv .hg/histedit-state-ignore .hg/histedit-state $ mv .hg/histedit-state-ignore .hg/histedit-state
$ hg sum $ hg sum
parent: 0:cb9a9f314b8b parent: 0:cb9a9f314b8b
a a

tests/test-qrecord.t

> y > y
> y > y
> n > n
> y > y
> y > y
> n > n
> EOF > EOF
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]

tests/test-rebase-abort.t

$ hg up -C 0 # user does other stuff in the repo $ hg up -C 0 # user does other stuff in the repo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv rebasestate .hg/ # user upgrades to 2.7 $ mv rebasestate .hg/ # user upgrades to 2.7
$ echo new > a $ echo new > a
$ hg up 1 # user gets an error saying to run hg rebase --abort $ hg up 1 # user gets an error saying to run hg rebase --abort
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ cat a $ cat a
new new
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ cat a $ cat a
new new
.hg/merge/state .hg/merge/state
.hg/rebasestate .hg/rebasestate
.hg/undo.backup.dirstate .hg/undo.backup.dirstate
.hg/undo.dirstate .hg/undo.dirstate
.hg/updatestate .hg/updatestate
$ hg rebase -s 3 -d tip $ hg rebase -s 3 -d tip
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ hg up . $ hg up .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ hg up -C . $ hg up -C .
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ hg graft 3 $ hg graft 3
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}" $ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a o 6 no-a
| |

tests/test-rebase-conflicts.t

# The repository is in an unfinished *rebase* state. # The repository is in an unfinished *rebase* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# common # common
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg rebase --continue' or 'hg rebase --abort' # To continue: hg rebase --continue
# To abort: hg rebase --abort
Try to continue without solving the conflict: Try to continue without solving the conflict:
$ hg rebase --continue $ hg rebase --continue
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [255]

tests/test-rebase-obsolete.t

unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --stop --dry-run $ hg rebase --stop --dry-run
abort: cannot specify both --dry-run and --stop abort: cannot specify both --dry-run and --stop
[255] [255]
$ hg rebase -s 3 -d 5 $ hg rebase -s 3 -d 5
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (To continue: hg rebase --continue
To abort: hg rebase --abort)
[255] [255]
$ hg rebase --stop --continue $ hg rebase --stop --continue
abort: cannot use --stop with --continue abort: cannot use --stop with --continue
[255] [255]
Test --stop moves bookmarks of original revisions to new rebased nodes: Test --stop moves bookmarks of original revisions to new rebased nodes:
====================================================================== ======================================================================
$ cd .. $ cd ..

tests/test-rebase-pull.t

$ hg histedit . -q --commands - << EOF $ hg histedit . -q --commands - << EOF
> edit d80cc2da061e histedit: generate unfinished state > edit d80cc2da061e histedit: generate unfinished state
> EOF > EOF
Editing (d80cc2da061e), you may commit or record as needed now. Editing (d80cc2da061e), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg pull --rebase $ hg pull --rebase
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (To continue: hg histedit --continue
To abort: hg histedit --abort)
[255] [255]
$ hg histedit --abort --quiet $ hg histedit --abort --quiet
Abort pull early with pending uncommitted merge: Abort pull early with pending uncommitted merge:
$ cd .. $ cd ..
$ hg clone --noupdate c d $ hg clone --noupdate c d
$ cd d $ cd d

tests/test-shelve.t

# The repository is in an unfinished *unshelve* state. # The repository is in an unfinished *unshelve* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a/a # a/a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg unshelve --continue' or 'hg unshelve --abort' # To continue: hg unshelve --continue
# To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts ensure that we have a merge with unresolved conflicts
#if phasebased #if phasebased
$ hg heads -q --template '{rev}\n' $ hg heads -q --template '{rev}\n'
8 8
5 5
diff --git a/c b/c.copy diff --git a/c b/c.copy
copy from c copy from c
copy to c.copy copy to c.copy
$ hg resolve -l $ hg resolve -l
U a/a U a/a
$ hg shelve $ hg shelve
abort: unshelve already in progress abort: unshelve already in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort') (To continue: hg unshelve --continue
To abort: hg unshelve --abort)
[255] [255]
abort the unshelve and be happy abort the unshelve and be happy
$ hg status $ hg status
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
$ hg revert -r . a/a $ hg revert -r . a/a
$ hg resolve -m a/a $ hg resolve -m a/a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg commit -m 'commit while unshelve in progress' $ hg commit -m 'commit while unshelve in progress'
abort: unshelve already in progress abort: unshelve already in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort') (To continue: hg unshelve --continue
To abort: hg unshelve --abort)
[255] [255]
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg unshelve --continue) (continue: hg unshelve --continue)
[255] [255]
$ hg unshelve -c $ hg unshelve -c
unshelve of 'default' complete unshelve of 'default' complete

tests/test-transplant.t

patching file baz patching file baz
Hunk #1 FAILED at 0 Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file baz.rej 1 out of 1 hunks FAILED -- saving rejects to file baz.rej
patch failed to apply patch failed to apply
abort: fix up the working directory and run hg transplant --continue abort: fix up the working directory and run hg transplant --continue
[255] [255]
$ hg transplant 1:3 $ hg transplant 1:3
abort: transplant in progress abort: transplant in progress
(use 'hg transplant --continue' or 'hg update' to abort) (To continue: hg transplant --continue
To abort: hg update)
[255] [255]
$ hg status -v $ hg status -v
A bar A bar
? baz.rej ? baz.rej
? foo.rej ? foo.rej
# The repository is in an unfinished *transplant* state. # The repository is in an unfinished *transplant* state.
# use 'hg transplant --continue' or 'hg update' to abort # To continue: hg transplant --continue
# To abort: hg update
$ echo fixed > baz $ echo fixed > baz
$ hg transplant --continue $ hg transplant --continue
9d6d6b5a8275 transplanted as d80c49962290 9d6d6b5a8275 transplanted as d80c49962290
applying 1dab759070cf applying 1dab759070cf
1dab759070cf transplanted to aa0ffe6bd5ae 1dab759070cf transplanted to aa0ffe6bd5ae
$ cd .. $ cd ..