This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9508

tests: show that in-memory rebase leaves state when working copy is dirty
ClosedPublic

Authored by martinvonz on Dec 2 2020, 6:46 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG39e2cf7cb120: tests: show that in-memory rebase leaves state when working copy is dirty
rHGd767f71b9158: tests: show that in-memory rebase leaves state when working copy is dirty
Summary

When in-memory rebase falls back to on-disk rebase, it checks if the
working copy is dirty. If it is, it aborts the rebase. However, it
leaves the rebase state on disk. I broke it in feffeb18d412 (rebase:
teach in-memory rebase to not restart with on-disk rebase on conflict,
2020-09-18).

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (8 lines)

Diff 23978

tests/test-rebase-inmemory.t

merging e merging e
hit merge conflicts; rebasing that commit again in the working copy hit merge conflicts; rebasing that commit again in the working copy
transaction abort! transaction abort!
rollback completed rollback completed
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ cat a $ cat a
dirty dirty
$ hg status -v
M a
# The repository is in an unfinished *rebase* state.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
# To stop: hg rebase --stop
Retrying without in-memory merge won't lose merge state Retrying without in-memory merge won't lose merge state
$ cd .. $ cd ..
$ hg clone repo3 repo3-merge-state -q $ hg clone repo3 repo3-merge-state -q
$ cd repo3-merge-state $ cd repo3-merge-state
$ hg merge 4 $ hg merge 4
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')