This is an archive of the discontinued Mercurial Phabricator instance.

Differential D211

tests: demonstrate broken rebase of merge with p1's successor in dest
ClosedPublic

Authored by martinvonz on Aug 2 2017, 1:10 AM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG644dddccc265: tests: demonstrate broken rebase of merge with p1's successor in dest
Summary

The fix in 8ede973597fd (rebase: handle successor targets (issue5198),
2016-04-11) only fixed the case where p2's successor was in the
destination, and only when the successor was exactly the destination
(i.e. not when the successor was an ancestor of it). This patch adds a
test case for when p1's successor is in the destination. It adds
another one for when the successor is an ancestor of the
destination. To do that simply, it also rewrites the test case using
drawdag.

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.Aug 2 2017, 1:10 AM
quark accepted this revision.Aug 2 2017, 4:01 PM
quark added a subscriber: quark.

Looks great! Thanks for finding and documenting these tricky cases!

There are a few places that might miss some English words. Those could probably be fixed in flight.

tests/test-rebase-obsolete.t
960

s/parent ancestor/parent being ancestor/g ?

martinvonz updated this revision to Diff 506.Aug 2 2017, 4:09 PM
martinvonz added inline comments.Aug 2 2017, 4:10 PM
tests/test-rebase-obsolete.t
960

Hmm, that didn't read very well (my version of it). I rephrased it slightly differently.

Closed by commit rHG644dddccc265: tests: demonstrate broken rebase of merge with p1's successor in dest (authored by martinvonz). · Explain WhyAug 3 2017, 10:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete.t (224 lines)

Diff 523

tests/test-rebase-obsolete.t

========================== ==========================
Test rebase with obsolete Test rebase with obsolete
========================== ==========================
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [experimental] > [experimental]
> evolution=createmarkers,allowunstable > evolution=createmarkers,allowunstable
> [phases] > [phases]
> publish=False > publish=False
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py
> EOF > EOF
Setup rebase canonical repo Setup rebase canonical repo
$ hg init base $ hg init base
$ cd base $ cd base
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 20:b82fb57ea638 "willconflict second version" rebasing 20:b82fb57ea638 "willconflict second version"
note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor" note: not rebasing 21:8b31da3c4919 "dummy change", already in destination as 19:601db7a18f51 "dummy change successor"
rebasing 22:7bdc8a87673d "dummy change" (tip) rebasing 22:7bdc8a87673d "dummy change" (tip)
$ cd .. $ cd ..
rebase source is obsoleted (issue5198) Rebase merge where successor of one parent is equal to destination (issue5198)
---------------------------------
$ hg clone base amended $ hg init p1-succ-is-dest
updating to branch default $ cd p1-succ-is-dest
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd amended $ hg debugdrawdag <<EOF
$ hg up 9520eea781bc > F
1 files updated, 0 files merged, 2 files removed, 0 files unresolved > /|
$ echo 1 >> E > E D B # replace: D -> B
$ hg commit --amend -m "E'" -d "0 0" > \|/
> A
> EOF
$ hg rebase -d B -s D
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
rebasing 4:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
@ 9:69abe8906104 E' o 5:50e9d60b99c6 F
| |\
| o 7:02de42196ebe H | | x 4:66f1a38021c9 F
| |/|
| o | 3:7fb047a69f22 E
| | |
| | x 2:b18e25de2cf5 D
| |/
o | 1:112478962961 B
|/
o 0:426bada5c675 A
$ cd ..
Rebase merge where successor of other parent is equal to destination
$ hg init p2-succ-is-dest
$ cd p2-succ-is-dest
$ hg debugdrawdag <<EOF
> F
> /|
> E D B # replace: E -> B
> \|/
> A
> EOF
BROKEN: Raises an exception
$ hg rebase -d B -s E 2>&1 | grep AssertionError:
AssertionError: no base found to rebase on (defineparents called wrong)
$ hg log -G
o 4:66f1a38021c9 F
|\
| x 3:7fb047a69f22 E
| | | |
| | o 6:eea13746799a G o | 2:b18e25de2cf5 D
|/
| o 1:112478962961 B
|/
o 0:426bada5c675 A
$ cd ..
Rebase merge where successor of one parent is ancestor of destination
quarkUnsubmitted
Not Done

s/parent ancestor/parent being ancestor/g ?

quark: `s/parent ancestor/parent being ancestor/g` ?
martinvonzAuthorUnsubmitted
Not Done

Hmm, that didn't read very well (my version of it). I rephrased it slightly differently.

martinvonz: Hmm, that didn't read very well (my version of it). I rephrased it slightly differently.
$ hg init p1-succ-in-dest
$ cd p1-succ-in-dest
$ hg debugdrawdag <<EOF
> F C
> /| |
> E D B # replace: D -> B
> \|/
> A
> EOF
$ hg rebase -d C -s D
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
rebasing 5:66f1a38021c9 "F" (F tip)
BROKEN: not rebased on top of requested destination (C)
$ hg log -G
o 6:50e9d60b99c6 F
|\
| | x 5:66f1a38021c9 F
| |/| | |/|
| o | 5:24b6387c8c8c F +-----o 4:26805aba1e60 C
| | |
| o | 3:7fb047a69f22 E
| | |
| | x 2:b18e25de2cf5 D
| |/
o | 1:112478962961 B
|/
o 0:426bada5c675 A
$ cd ..
Rebase merge where successor of other parent is ancestor of destination
$ hg init p2-succ-in-dest
$ cd p2-succ-in-dest
$ hg debugdrawdag <<EOF
> F C
> /| |
> E D B # replace: E -> B
> \|/
> A
> EOF
BROKEN: Raises an exception
$ hg rebase -d C -s E 2>&1 | grep AssertionError:
AssertionError: no base found to rebase on (defineparents called wrong)
$ hg log -G
o 5:66f1a38021c9 F
|\
| | o 4:26805aba1e60 C
| | |
| x | 3:7fb047a69f22 E
| | |
o | | 2:b18e25de2cf5 D
|/ / |/ /
| x 4:9520eea781bc E | o 1:112478962961 B
|/ |/
| o 3:32af7686d403 D o 0:426bada5c675 A
| |
| o 2:5fddd98957c8 C $ cd ..
| |
| o 1:42ccdea3bb16 B Rebase merge where successor of one parent is ancestor of destination
$ hg init p1-succ-in-dest-b
$ cd p1-succ-in-dest-b
$ hg debugdrawdag <<EOF
> F C
> /| |
> E D B # replace: E -> B
> \|/
> A
> EOF
$ hg rebase -d C -b F
rebasing 2:b18e25de2cf5 "D" (D)
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
rebasing 5:66f1a38021c9 "F" (F tip)
$ hg log -G
o 7:9ed45af61fa0 F
|
o 6:8f47515dda15 D
|
| x 5:66f1a38021c9 F
| |\
o | | 4:26805aba1e60 C
| | |
| | x 3:7fb047a69f22 E
| | |
| x | 2:b18e25de2cf5 D
| |/
o / 1:112478962961 B
|/ |/
o 0:cd010b8cd998 A o 0:426bada5c675 A
$ cd ..
Rebase merge where successor of other parent is ancestor of destination
$ hg rebase -d . -s 9520eea781bc $ hg init p2-succ-in-dest-b
note: not rebasing 4:9520eea781bc "E", already in destination as 9:69abe8906104 "E'" $ cd p2-succ-in-dest-b
rebasing 6:eea13746799a "G"
$ hg debugdrawdag <<EOF
> F C
> /| |
> E D B # replace: D -> B
> \|/
> A
> EOF
$ hg rebase -d C -b F
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
rebasing 3:7fb047a69f22 "E" (E)
rebasing 5:66f1a38021c9 "F" (F tip)
BROKEN: This should have resulted in a rebased F with one parent, just like in
the test case above
$ hg log -G $ hg log -G
o 10:17be06e82e95 G o 7:c1e6f26e339d F
|\ |\
| @ 9:69abe8906104 E' | o 6:533690786a86 E
| |
+---o 7:02de42196ebe H
| |
o | 5:24b6387c8c8c F
|/ |/
| o 3:32af7686d403 D | x 5:66f1a38021c9 F
| | | |\
| o 2:5fddd98957c8 C o | | 4:26805aba1e60 C
| | | | |
| o 1:42ccdea3bb16 B | | x 3:7fb047a69f22 E
| | |
| x | 2:b18e25de2cf5 D
| |/
o / 1:112478962961 B
|/ |/
o 0:cd010b8cd998 A o 0:426bada5c675 A
$ cd .. $ cd ..
Test that bookmark is moved and working dir is updated when all changesets have Test that bookmark is moved and working dir is updated when all changesets have
equivalents in destination equivalents in destination
$ hg init rbsrepo && cd rbsrepo $ hg init rbsrepo && cd rbsrepo
$ echo "[experimental]" > .hg/hgrc $ echo "[experimental]" > .hg/hgrc
$ echo "evolution=all" >> .hg/hgrc $ echo "evolution=all" >> .hg/hgrc