This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5359

tests: show that in-mem rebase does not find path dir/file conflicts
ClosedPublic

Authored by martinvonz on Dec 3 2018, 5:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe204d9a27528: tests: show that in-mem rebase does not find path dir/file conflicts

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, 5:10 PM
martinvonz added a comment.Dec 3 2018, 5:10 PM

This series is meant for the stable branch

Closed by commit rHGe204d9a27528: tests: show that in-mem rebase does not find path dir/file conflicts (authored by martinvonz). · Explain WhyDec 4 2018, 7:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 12690

tests/test-rebase-inmemory.t

| o 3: 844a7de3e617 'c' | o 3: 844a7de3e617 'c'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 1: fc055c3b4d33 'b' o | 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ mkdir c
$ echo c > c/c
$ hg add c/c
$ hg ci -m 'c/c'
BROKEN: This should be a conflict, should not crash
$ hg rebase -r . -d 3 -n 2>&1 | grep KeyError
KeyError: 'c'
BROKEN: This should be a conflict, should not crash
$ hg rebase -r 3 -d . -n 2>&1 | grep KeyError
KeyError: 'c/c'
$ cd .. $ cd ..
Test dry-run rebasing Test dry-run rebasing
$ hg init repo3 $ hg init repo3
$ cd repo3 $ cd repo3
$ echo a>a $ echo a>a