This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3693

shelve: directly handle the initial parent alignment
ClosedPublic

Authored by lothiraldan on Jun 5 2018, 6:58 AM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHGc829749e7639: shelve: directly handle the initial parent alignment
Summary

Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.

After this change, we no longer need to use rebase in shelve.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Jun 5 2018, 6:58 AM
pulkit accepted this revision.Jun 29 2018, 3:09 PM
pulkit added a comment.Jun 29 2018, 3:18 PM

I am very much happy with the cleanup but I don't feel confident enough to push this. Queued D3692.

lothiraldan updated this revision to Diff 9408.Jul 2 2018, 4:12 PM
durin42 accepted this revision.Jul 9 2018, 4:32 PM
This revision is now accepted and ready to land.Jul 9 2018, 4:32 PM
Closed by commit rHGc829749e7639: shelve: directly handle the initial parent alignment (authored by lothiraldan). · Explain WhyJul 9 2018, 4:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (65 lines)
Mtests/test-copytrace-heuristics.t (1 line)
Mtests/test-shelve.t (26 lines)

Diff 9483

hgext/shelve.py

if list(ms.unresolved()): if list(ms.unresolved()):
raise error.Abort( raise error.Abort(
_("unresolved conflicts, can't continue"), _("unresolved conflicts, can't continue"),
hint=_("see 'hg resolve', then 'hg unshelve --continue'")) hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
shelvectx = repo[state.parents[1]] shelvectx = repo[state.parents[1]]
pendingctx = state.pendingctx pendingctx = state.pendingctx
with repo.dirstate.parentchange():
repo.setparents(state.pendingctx.node(), nodemod.nullid)
repo.dirstate.write(repo.currenttransaction())
overrides = {('phases', 'new-commit'): phases.secret} overrides = {('phases', 'new-commit'): phases.secret}
with repo.ui.configoverride(overrides, 'unshelve'): with repo.ui.configoverride(overrides, 'unshelve'):
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(state.parents[0], nodemod.nullid) repo.setparents(state.parents[0], nodemod.nullid)
newnode = repo.commit(text=shelvectx.description(), newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(), extra=shelvectx.extra(),
user=shelvectx.user(), user=shelvectx.user(),
date=shelvectx.date()) date=shelvectx.date())
tmpwctx, shelvectx, branchtorestore, tmpwctx, shelvectx, branchtorestore,
activebookmark): activebookmark):
"""Rebase restored commit from its original location to a destination""" """Rebase restored commit from its original location to a destination"""
# If the shelve is not immediately on top of the commit # If the shelve is not immediately on top of the commit
# we'll be merging with, rebase it to be on top. # we'll be merging with, rebase it to be on top.
if tmpwctx.node() == shelvectx.parents()[0].node(): if tmpwctx.node() == shelvectx.parents()[0].node():
return shelvectx return shelvectx
overrides = {
('ui', 'forcemerge'): opts.get('tool', ''),
('phases', 'new-commit'): phases.secret,
}
with repo.ui.configoverride(overrides, 'unshelve'):
ui.status(_('rebasing shelved changes\n')) ui.status(_('rebasing shelved changes\n'))
try: stats = merge.graft(repo, shelvectx, shelvectx.p1(),
rebase.rebase(ui, repo, **{ labels=['dest', 'source'],
r'rev': [shelvectx.rev()], keepconflictparent=True)
r'dest': "%d" % tmpwctx.rev(), if stats.unresolvedcount:
r'keep': True,
r'tool': opts.get('tool', ''),
})
except error.InterventionRequired:
tr.close() tr.close()
nodestoremove = [repo.changelog.node(rev) nodestoremove = [repo.changelog.node(rev)
for rev in xrange(oldtiprev, len(repo))] for rev in xrange(oldtiprev, len(repo))]
shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove, shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
branchtorestore, opts.get('keep'), activebookmark) branchtorestore, opts.get('keep'), activebookmark)
repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise error.InterventionRequired( raise error.InterventionRequired(
_("unresolved conflicts (see 'hg resolve', then " _("unresolved conflicts (see 'hg resolve', then "
"'hg unshelve --continue')")) "'hg unshelve --continue')"))
# refresh ctx after rebase completes with repo.dirstate.parentchange():
shelvectx = repo['tip'] repo.setparents(tmpwctx.node(), nodemod.nullid)
newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(),
user=shelvectx.user(),
date=shelvectx.date())
if tmpwctx not in shelvectx.parents(): if newnode is None:
# rebase was a no-op, so it produced no child commit # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
merge.mergestate.clean(repo)
shelvectx = tmpwctx shelvectx = tmpwctx
msg = _('note: unshelved changes already existed '
'in the working copy\n')
ui.status(msg)
else:
shelvectx = repo[newnode]
hg.updaterepo(repo, tmpwctx.node(), False)
return shelvectx return shelvectx
def _forgetunknownfiles(repo, shelvectx, addedbefore): def _forgetunknownfiles(repo, shelvectx, addedbefore):
# Forget any files that were unknown before the shelve, unknown before # Forget any files that were unknown before the shelve, unknown before
# unshelve started, but are now added. # unshelve started, but are now added.
shelveunknown = shelvectx.extra().get('shelve_unknown') shelveunknown = shelvectx.extra().get('shelve_unknown')
if not shelveunknown: if not shelveunknown:
return return

tests/test-copytrace-heuristics.t

$ hg log -G -T 'changeset: {node}\n desc: {desc}\n' $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
| desc: mv a b | desc: mv a b
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
desc: initial desc: initial
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 2:45f63161acea "changes to: initial" (tip)
merging b and a to b merging b and a to b
$ ls $ ls
b b
$ cat b $ cat b
b b
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo

tests/test-shelve.t

local edits should not prevent a shelved change from applying local edits should not prevent a shelved change from applying
$ printf "z\na\n" > a/a $ printf "z\na\n" > a/a
$ hg unshelve --keep $ hg unshelve --keep
unshelving change 'default-01' unshelving change 'default-01'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 4:32c69314e062 "changes to: [mq]: second.patch" (tip)
merging a/a merging a/a
$ hg revert --all -q $ hg revert --all -q
$ rm a/a.orig b.rename/b c.copy $ rm a/a.orig b.rename/b c.copy
apply it and make sure our state is as expected apply it and make sure our state is as expected
(this also tests that same timestamp prevents backups from being (this also tests that same timestamp prevents backups from being
$ hg add foo/foo $ hg add foo/foo
force a conflicted merge to occur force a conflicted merge to occur
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
merging a/a merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg status -v $ hg status -v
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
$ hg add foo/foo $ hg add foo/foo
if we resolve a conflict while unshelving, the unshelve should succeed if we resolve a conflict while unshelving, the unshelve should succeed
$ hg unshelve --tool :merge-other --keep $ hg unshelve --tool :merge-other --keep
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 6:2f694dd83a13 "changes to: second" (tip)
merging a/a merging a/a
$ hg parents -q $ hg parents -q
4:33f7f61e6c5e 4:33f7f61e6c5e
$ hg shelve -l $ hg shelve -l
default (*)* changes to: second (glob) default (*)* changes to: second (glob)
$ hg status $ hg status
M a/a M a/a
A foo/foo A foo/foo
$ cat a/a $ cat a/a
a a
c c
a a
$ cat > a/a << EOF $ cat > a/a << EOF
> a > a
> c > c
> x > x
> EOF > EOF
$ HGMERGE=true hg unshelve $ HGMERGE=true hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 6:2f694dd83a13 "changes to: second" (tip)
merging a/a merging a/a
note: rebase of 6:2f694dd83a13 created no changes to commit note: unshelved changes already existed in the working copy
$ hg parents -q $ hg parents -q
4:33f7f61e6c5e 4:33f7f61e6c5e
$ hg shelve -l $ hg shelve -l
$ hg status $ hg status
A foo/foo A foo/foo
$ cat a/a $ cat a/a
a a
c c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -d 6c103be8f4e4 --config extensions.rebase= $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
rebasing 2:323bfa07f744 "xyz" (tip) rebasing 2:323bfa07f744 "xyz" (tip)
merging x merging x
saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip)
$ hg status $ hg status
M z M z
$ cd .. $ cd ..
shelve should only unshelve pending changes (issue4068) shelve should only unshelve pending changes (issue4068)
$ hg init onlypendingchanges $ hg init onlypendingchanges
$ hg add d $ hg add d
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up -q 0e067c57feba $ hg up -q 0e067c57feba
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 3:958bcbd1776e "changes to: c" (tip)
$ hg status $ hg status
A d A d
unshelve should work on an ancestor of the original commit unshelve should work on an ancestor of the original commit
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up 3903775176ed $ hg up 3903775176ed
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 3:013284d9655e "changes to: b" (tip)
$ hg status $ hg status
A d A d
test bug 4073 we need to enable obsolete markers for it test bug 4073 we need to enable obsolete markers for it
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
o 0 a test o 0 a test
$ mv f.orig f $ mv f.orig f
$ echo 1 > a $ echo 1 > a
$ hg unshelve --date '1073741824 0' $ hg unshelve --date '1073741824 0'
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
@ 5 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000 @ 5 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000
| |
| @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
M a M a
? f.orig ? f.orig
$ cat f.orig $ cat f.orig
g g
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
$ hg st $ hg st
M a M a
A f A f
? f.orig ? f.orig
other committed changes - merge: other committed changes - merge:
$ hg shelve f $ hg shelve f
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg ci a -m 'intermediate other change' $ hg ci a -m 'intermediate other change'
$ mv f.orig f $ mv f.orig f
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg st $ hg st
M f M f
? f.orig ? f.orig
$ cat f $ cat f
$ hg up test $ hg up test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark test) (activating bookmark test)
$ hg bookmark $ hg bookmark
* test 4:33f7f61e6c5e * test 4:33f7f61e6c5e
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 5:e42a7da90865 "changes to: second" (tip)
merging a/a merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg bookmark $ hg bookmark
test 4:33f7f61e6c5e test 4:33f7f61e6c5e
Test that resolving all conflicts in one direction (so that the rebase Test that resolving all conflicts in one direction (so that the rebase
M a/a M a/a
? foo/foo ? foo/foo
$ hg bookmark $ hg bookmark
* test 4:33f7f61e6c5e * test 4:33f7f61e6c5e
$ hg unshelve $ hg unshelve
unshelving change 'test' unshelving change 'test'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 6:96a1354f65f6 "changes to: create conflict" (tip)
merging a/a merging a/a
$ hg bookmark $ hg bookmark
* test 4:33f7f61e6c5e * test 4:33f7f61e6c5e
$ cat a/a $ cat a/a
a a
a a
c c
x x
==== before-unshelving: ==== before-unshelving:
VISIBLE 5:703117a2acfb VISIBLE 5:703117a2acfb
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
$ hg unshelve --keep default $ hg unshelve --keep default
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
==== preupdate: ==== preupdate:
VISIBLE 6:66b86db80ee4 VISIBLE 6:66b86db80ee4
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
==== preupdate: ==== preupdate:
VISIBLE 8:a0e04704317e VISIBLE 8:92fdbb7b4de7
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
==== preupdate: ==== preupdate:
VISIBLE 6:66b86db80ee4 VISIBLE 6:66b86db80ee4
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
==== before-unshelving: ==== before-unshelving:
VISIBLE 5:703117a2acfb VISIBLE 5:703117a2acfb
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
$ hg unshelve --keep default $ hg unshelve --keep default
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
==== update: ==== update:
VISIBLE 6:66b86db80ee4 VISIBLE 6:66b86db80ee4
VISIBLE 7:206bf5d4f922 VISIBLE 7:206bf5d4f922
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
==== ====
==== update: ==== update:
VISIBLE 6:66b86db80ee4 VISIBLE 6:66b86db80ee4
ACTUAL 5:703117a2acfb ACTUAL 5:703117a2acfb
$ touch unknown $ touch unknown
$ hg add unknown $ hg add unknown
$ hg status $ hg status
A unknown A unknown
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 1:098df96e7410 "(changes in empty repository)" (tip)
merging unknown merging unknown
$ hg status $ hg status
A unknown A unknown
$ hg forget unknown $ hg forget unknown
$ rm unknown $ rm unknown
And if I shelve, commit, then unshelve, does it become modified? And if I shelve, commit, then unshelve, does it become modified?
$ echo unknown > unknown $ echo unknown > unknown
$ hg shelve -u $ hg shelve -u
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg status $ hg status
$ touch unknown $ touch unknown
$ hg add unknown $ hg add unknown
$ hg commit -qm "Add unknown" $ hg commit -qm "Add unknown"
$ hg status $ hg status
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 1:098df96e7410 "(changes in empty repository)" (tip)
merging unknown merging unknown
$ hg status $ hg status
M unknown M unknown
$ hg remove --force unknown $ hg remove --force unknown
$ hg commit -qm "Remove unknown" $ hg commit -qm "Remove unknown"
$ cd .. $ cd ..
default default
$ echo "ccc" >> a $ echo "ccc" >> a
$ hg status $ hg status
M a M a
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 2:425c97ef07f3 "changes to: a" (tip)
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ echo "aaabbbccc" > a $ echo "aaabbbccc" > a
$ rm a.orig $ rm a.orig
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
$ hg shelve $ hg shelve
shelved as test shelved as test
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg update -r 7049e48789d7 $ hg update -r 7049e48789d7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg unshelve $ hg unshelve
unshelving change 'test' unshelving change 'test'
rebasing shelved changes rebasing shelved changes
rebasing 2:357525f34729 "changes to: test-commit" (tip)
$ hg status $ hg status
A b A b
$ hg branch $ hg branch
default default
$ cd .. $ cd ..
When i unshelve resulting in merge conflicts and makes saved When i unshelve resulting in merge conflicts and makes saved
file shelvedstate looks like in previous versions in file shelvedstate looks like in previous versions in
default default
$ echo "ccc" >> a $ echo "ccc" >> a
$ hg status $ hg status
M a M a
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
rebasing 2:425c97ef07f3 "changes to: a" (tip)
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
Removing restore branch information from shelvedstate file(making it looks like Removing restore branch information from shelvedstate file(making it looks like
in previous versions) and running unshelve --continue in previous versions) and running unshelve --continue
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo text2 > file && hg ci -Am text1 $ echo text2 > file && hg ci -Am text1
adding file adding file
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 1:396ea74229f9 "(changes in empty repository)" (tip)
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ echo somethingsomething > .hg/shelvedstate $ echo somethingsomething > .hg/shelvedstate
Unshelve --continue fails with appropriate message if shelvedstate is corrupted Unshelve --continue fails with appropriate message if shelvedstate is corrupted
$ hg unshelve --continue $ hg unshelve --continue
shelved as default shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 3 >> file && hg ci -Am 13 $ echo 3 >> file && hg ci -Am 13
$ hg shelve --list $ hg shelve --list
default (*s ago) * changes to: 1 (glob) default (*s ago) * changes to: 1 (glob)
$ hg unshelve --keep $ hg unshelve --keep
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
rebasing 2:3fbe6fbb0bef "changes to: 1" (tip)
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg unshelve --continue $ hg unshelve --continue
shelved as ashelve shelved as ashelve
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 2 > a $ echo 2 > a
$ hg ci -Am a $ hg ci -Am a
adding a adding a
$ hg unshelve $ hg unshelve
unshelving change 'ashelve' unshelving change 'ashelve'
rebasing shelved changes rebasing shelved changes
rebasing 2:003d2d94241c "changes to: root" (tip)
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
putting v1 shelvedstate file in place of a created v2 putting v1 shelvedstate file in place of a created v2
$ cat << EOF > .hg/shelvedstate $ cat << EOF > .hg/shelvedstate
> 1 > 1
> ashelve > ashelve