This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11705

merge-halt: demonstrate unshelve issue with merge.on-failure=halt
ClosedPublic

Authored by spectral on Oct 19 2021, 9:27 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3e66e4517744: merge-halt: demonstrate unshelve issue with merge.on-failure=halt
rHG7b0b417cd960: merge-halt: demonstrate unshelve issue with merge.on-failure=halt

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

spectral created this revision.Oct 19 2021, 9:27 PM
Alphare accepted this revision.Oct 20 2021, 5:07 AM
Alphare added a subscriber: Alphare.

This looks good, but it should go on stable (as should the fix), I'll tell you if that doesn't apply.

tests/test-merge-halt.t
197

FYI there is (missing-correct-output !) and (known-bad-output !) for that kind of expected changes.

This revision is now accepted and ready to land.Oct 20 2021, 5:07 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-halt.t (54 lines)

Diff 30937

tests/test-merge-halt.t

Check that successful tool otherwise allows the merge to continue Check that successful tool otherwise allows the merge to continue
$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
$TESTTMP/repo/a *a~base* *a~other* (glob) $TESTTMP/repo/a *a~base* *a~other* (glob)
$TESTTMP/repo/b *b~base* *b~other* (glob) $TESTTMP/repo/b *b~base* *b~other* (glob)
Check that unshelve isn't broken by halting the merge
$ cat <<EOS >> $HGRCPATH
> [extensions]
> shelve =
> EOS
$ echo foo > shelve_file1
$ echo foo > shelve_file2
$ hg ci -qAm foo
$ echo bar >> shelve_file1
$ echo bar >> shelve_file2
$ hg shelve --list
$ hg shelve
shelved as default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo baz >> shelve_file1
$ echo baz >> shelve_file2
$ hg ci -m baz
$ hg unshelve --tool false --config merge-tools.false.premerge=keep
unshelving change 'default'
rebasing shelved changes
merging shelve_file1
merging shelve_file2
merging shelve_file1 failed!
merge halted after failed merge (see hg resolve)
[240]
FIXME: This should claim it's in an 'unshelve' state
$ hg status --config commands.status.verbose=True
M shelve_file1
M shelve_file2
? shelve_file1.orig
? shelve_file2.orig
# The repository is in an unfinished *update* state.
AlphareUnsubmitted
Not Done

FYI there is (missing-correct-output !) and (known-bad-output !) for that kind of expected changes.

Alphare: FYI there is `(missing-correct-output !)` and `(known-bad-output !)` for that kind of expected…
# Unresolved merge conflicts:
#
# shelve_file1
# shelve_file2
#
# To mark files as resolved: hg resolve --mark FILE
# To continue: hg update .
FIXME: This should not be referencing a stripped commit.
$ hg resolve --tool false --all --re-merge
abort: unknown revision '4a1d727ea5bb6aed9adfacb2a8f776bae44301d6'
[255]
Ensure the shelve is still around, since we haven't finished the operation yet.
$ hg shelve --list
default (* ago) changes to: foo (glob)
FIXME: `hg unshelve --abort` should work.
$ hg unshelve --abort
abort: no unshelve in progress
[20]