This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3686

shelve: wider check for successful abort in test
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2313a3599e41: shelve: wider check for successful abort in test
Summary

The test was previously focusing on checking that the "sub-rebase" aborted
properly. Since rebase is an implementation details we should also check for
other messages.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Jun 5 2018, 6:56 AM
Closed by commit rHG2313a3599e41: shelve: wider check for successful abort in test (authored by lothiraldan). · Explain WhyJun 16 2018, 4:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 8974

tests/test-shelve.t

$ hg shelve -q $ hg shelve -q
$ echo 'contADDent' > root $ echo 'contADDent' > root
$ hg unshelve -q $ hg unshelve -q
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (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]
$ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
$ mv ../corrupt-shelvedstate .hg/histedit-state $ mv ../corrupt-shelvedstate .hg/histedit-state
$ hg unshelve --abort 2>&1 | grep 'rebase aborted' $ hg unshelve --abort 2>&1 | grep 'aborted'
rebase aborted rebase aborted
unshelve of 'default-01' aborted
$ hg summary
parent: 0:ae8c668541e8 tip
root
branch: default
commit: 1 modified, 1 unknown
update: (current)
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)
----------------------------------------------------------------------- -----------------------------------------------------------------------