This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5355

tests: show that in-mem rebase falling back loses state
ClosedPublic

Authored by martinvonz on Dec 3 2018, 12:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8ff910b21eef: tests: show that in-mem rebase falling back loses state
Summary

Both working copy changes and the merge state is lost when in-memory
rebase falls back to on-disk mode.

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

martinvonz created this revision.Dec 3 2018, 12:50 PM
martinvonz added a comment.Dec 3 2018, 12:51 PM

This series is meant for the stable branch.

Closed by commit rHG8ff910b21eef: tests: show that in-mem rebase falling back loses state (authored by martinvonz). · Explain WhyDec 3 2018, 3:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 12680

tests/test-rebase-inmemory.t

#require symlink execbit #require symlink execbit
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [phases]
> publish=False
> [extensions] > [extensions]
> amend= > amend=
> rebase= > rebase=
> debugdrawdag=$TESTDIR/drawdag.py > debugdrawdag=$TESTDIR/drawdag.py
> strip= > strip=
> [rebase] > [rebase]
> experimental.inmemory=1 > experimental.inmemory=1
> [diff] > [diff]
rebase aborted rebase aborted
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
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')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
rebase aborted
Retrying without in-memory merge won't lose working copy changes
$ cd ..
$ hg clone repo3 repo3-dirty -q
$ cd repo3-dirty
$ echo dirty > a
$ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
merging e
transaction abort!
rollback completed
hit merge conflicts; re-running rebase without in-memory merge
rebase aborted
rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
BROKEN: working copy change to "a" was lost
$ cat a
a
Retrying without in-memory merge won't lose merge state
$ cd ..
$ hg clone repo3 repo3-merge-state -q
$ cd repo3-merge-state
$ hg merge 4
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
2 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -l
U e
BROKEN: these should not say "created no changes to commit"
$ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c"
note: rebase of 2:177f92b77385 created no changes to commit
rebasing 3:055a42cdd887 "d"
note: rebase of 3:055a42cdd887 created no changes to commit
rebasing 4:e860deea161a "e"
note: rebase of 4:e860deea161a created no changes to commit
saved backup bundle to $TESTTMP/repo1/repo3-merge-state/.hg/strip-backup/177f92b77385-4da7ba9e-rebase.hg
BROKEN: merge state lost
$ hg resolve -l
========================== ==========================
Test for --confirm option| Test for --confirm option|
========================== ==========================
$ cd .. $ cd ..
$ hg clone repo3 repo4 -q $ hg clone repo3 repo4 -q
$ cd repo4 $ cd repo4
$ hg strip 7 -q $ hg strip 7 -q