( )⚙ D3691 shelve: stop testing missing rebase state file

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3691

shelve: stop testing missing rebase state file
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa8f99334ae31: shelve: stop testing missing rebase state file
Summary

We no longer use the file. Neither during rebase not during continue.

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:57 AM
durin42 accepted this revision.Jun 25 2018, 10:51 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:51 AM
Closed by commit rHGa8f99334ae31: shelve: stop testing missing rebase state file (authored by lothiraldan). · Explain WhyJun 25 2018, 11:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-shelve.t (18 lines)

Diff 9292

tests/test-shelve.t

unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ ls .hg/origbackups $ ls .hg/origbackups
root root
$ rm -rf .hg/origbackups $ rm -rf .hg/origbackups
test Abort unshelve always gets user out of the unshelved state test Abort unshelve always gets user out of the unshelved state
--------------------------------------------------------------- ---------------------------------------------------------------
Wreak havoc on the unshelve process
$ rm .hg/unshelverebasestate
$ hg unshelve --abort
unshelve of 'default' aborted
Try again but with a corrupted shelve state file with a corrupted shelve state file
$ hg up -r 0 -q
$ echo '' > root
$ hg shelve -q
$ echo 'contADDent' > root
$ hg unshelve -q
warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
$ mv ../corrupt-shelvedstate .hg/shelvestate $ mv ../corrupt-shelvedstate .hg/shelvestate
$ hg unshelve --abort 2>&1 | grep 'aborted' $ hg unshelve --abort 2>&1 | grep 'aborted'
unshelve of 'default-01' aborted unshelve of 'default' aborted
$ hg summary $ hg summary
parent: 0:ae8c668541e8 tip parent: 0:ae8c668541e8 tip
root root
branch: default branch: default
commit: 1 modified, 1 unknown commit: 1 modified
update: (current) update: (current)
phases: 1 draft phases: 1 draft
$ hg up -C . $ hg up -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
$ cd .. $ cd ..
Keep active bookmark while (un)shelving even on shared repo (issue4940) Keep active bookmark while (un)shelving even on shared repo (issue4940)