This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2910

tests: use drawdag in test-rebase-collapse.t
ClosedPublic

Authored by martinvonz on Mar 21 2018, 2:10 PM.

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdd2833e4d660: tests: use drawdag in test-rebase-collapse.t
Summary

This makes the tests shorter (410 lines -> 240 lines), faster (17s ->
12s), and easier to read (the setup for each test case is just before
the test, and we can refer to commits by name).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:23 PM
indygreg added a subscriber: indygreg.

This was hard to review. But I didn't see anything obviously wrong with this refactor.

tests/test-rebase-collapse.t
182

Are we really printing revision numbers here?!

This revision is now accepted and ready to land.Mar 21 2018, 7:23 PM
Closed by commit rHGdd2833e4d660: tests: use drawdag in test-rebase-collapse.t (authored by martinvonz). · Explain WhyMar 21 2018, 7:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-collapse.t (653 lines)

Diff 7173

tests/test-rebase-collapse.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> mq= > mq=
> drawdag=$TESTDIR/drawdag.py
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
> EOF > EOF
Create repo a: Highest phase of source commits is used:
$ hg init a $ hg init phase
$ cd a $ cd phase
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg debugdrawdag << 'EOF'
adding changesets > D
adding manifests > |
adding file changes > F C
added 8 changesets with 7 changes to 7 files (+2 heads) > | |
new changesets cd010b8cd998:02de42196ebe > E B
(run 'hg heads' to see heads, 'hg merge' to merge) > |/
$ hg up tip > A
3 files updated, 0 files merged, 0 files removed, 0 files unresolved > EOF
$ hg tglog
@ 7: 02de42196ebe 'H'
|
| o 6: eea13746799a 'G'
|/|
o | 5: 24b6387c8c8c 'F'
| |
| o 4: 9520eea781bc 'E'
|/
| o 3: 32af7686d403 'D'
| |
| o 2: 5fddd98957c8 'C'
| |
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Rebasing B onto H and collapsing changesets with different phases:
$ hg clone -q -u 3 a a1
$ cd a1
$ hg phase --force --secret 3 $ hg phase --force --secret D
$ cat > $TESTTMP/editor.sh <<EOF $ cat > $TESTTMP/editor.sh <<EOF
> echo "==== before editing" > echo "==== before editing"
> cat \$1 > cat \$1
> echo "====" > echo "===="
> echo "edited manually" >> \$1 > echo "edited manually" >> \$1
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest 7 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest F
rebasing 1:42ccdea3bb16 "B" rebasing 1:112478962961 "B" (B)
rebasing 2:5fddd98957c8 "C" rebasing 3:26805aba1e60 "C" (C)
rebasing 3:32af7686d403 "D" rebasing 5:f585351a92f8 "D" (D tip)
==== before editing ==== before editing
Collapsed revision Collapsed revision
* B * B
* C * C
* D * D
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added B HG: added B
HG: added C HG: added C
HG: added D HG: added D
==== ====
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg saved backup bundle to $TESTTMP/phase/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglogp $ hg tglogp
@ 5: 30882080ba93 secret 'Collapsed revision o 3: 92fa5f5fe108 secret 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| |
| |
| edited manually' | edited manually'
o 4: 02de42196ebe draft 'H' o 2: 64a8289d2492 draft 'F'
| |
| o 3: eea13746799a draft 'G' o 1: 7fb047a69f22 draft 'E'
|/| |
o | 2: 24b6387c8c8c draft 'F' o 0: 426bada5c675 draft 'A'
| |
| o 1: 9520eea781bc draft 'E'
|/
o 0: cd010b8cd998 draft 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
E
F F
H
$ cd .. $ cd ..
Rebasing E onto H: Merge gets linearized:
$ hg clone -q -u . a a2 $ hg init linearized-merge
$ cd a2 $ cd linearized-merge
$ hg phase --force --secret 6 $ hg debugdrawdag << 'EOF'
$ hg rebase --source 4 --collapse --dest 7 > F D
rebasing 4:9520eea781bc "E" > |/|
rebasing 6:eea13746799a "G" > C B
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg > |/
> A
> EOF
$ hg phase --force --secret D
$ hg rebase --source B --collapse --dest F
rebasing 1:112478962961 "B" (B)
rebasing 3:4e4f9194f9f1 "D" (D)
saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg
$ hg tglog $ hg tglog
o 6: 7dd333a2d1e4 'Collapsed revision o 3: 5bdc08b7da2b 'Collapsed revision
| * E | * B
| * G' | * D'
@ 5: 02de42196ebe 'H' o 2: afc707c82df0 'F'
| |
o 4: 24b6387c8c8c 'F' o 1: dc0947a82db8 'C'
| |
| o 3: 32af7686d403 'D' o 0: 426bada5c675 'A'
| |
| o 2: 5fddd98957c8 'C'
| |
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
E B
C
F F
H
$ cd .. $ cd ..
Rebasing G onto H with custom message: Custom message:
$ hg clone -q -u . a a3 $ hg init message
$ cd a3 $ cd message
$ hg rebase --base 6 -m 'custom message' $ hg debugdrawdag << 'EOF'
> C
> |
> D B
> |/
> A
> EOF
$ hg rebase --base B -m 'custom message'
abort: message can only be specified with collapse abort: message can only be specified with collapse
[255] [255]
$ cat > $TESTTMP/checkeditform.sh <<EOF $ cat > $TESTTMP/checkeditform.sh <<EOF
> env | grep HGEDITFORM > env | grep HGEDITFORM
> true > true
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
rebasing 4:9520eea781bc "E" rebasing 1:112478962961 "B" (B)
rebasing 6:eea13746799a "G" rebasing 3:26805aba1e60 "C" (C tip)
HGEDITFORM=rebase.collapse HGEDITFORM=rebase.collapse
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg
$ hg tglog $ hg tglog
o 6: 38ed6a6b026b 'custom message' o 2: 2f197b9a08f3 'custom message'
| |
@ 5: 02de42196ebe 'H' o 1: b18e25de2cf5 'D'
| |
o 4: 24b6387c8c8c 'F' o 0: 426bada5c675 'A'
|
| o 3: 32af7686d403 'D'
| |
| o 2: 5fddd98957c8 'C'
| |
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
E B
F C
H D
$ cd ..
Create repo b:
$ hg init b
$ cd b
$ echo A > A
$ hg ci -Am A
adding A
$ echo B > B
$ hg ci -Am B
adding B
$ hg up -q 0
$ echo C > C
$ hg ci -Am C
adding C
created new head
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ echo D > D
$ hg ci -Am D
adding D
$ hg up -q 1
$ echo E > E
$ hg ci -Am E
adding E
created new head
$ echo F > F
$ hg ci -Am F
adding F
$ hg merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m G
$ hg up -q 0
$ echo H > H
$ hg ci -Am H
adding H
created new head
$ hg tglog
@ 7: c65502d41787 'H'
|
| o 6: c772a8b2dc17 'G'
| |\
| | o 5: 7f219660301f 'F'
| | |
| | o 4: 8a5212ebc852 'E'
| | |
| o | 3: 2870ad076e54 'D'
| |\|
| o | 2: c5cefa58fd55 'C'
|/ /
| o 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
Rebase and collapse - more than one external (fail): Rebase and collapse - more than one external (fail):
$ hg clone -q -u . b b1 $ hg init multiple-external-parents
$ cd b1 $ cd multiple-external-parents
$ hg rebase -s 2 --dest 7 --collapse $ hg debugdrawdag << 'EOF'
abort: unable to collapse on top of 7, there is more than one external parent: 1, 5 > G
> |\
> | F
> | |
> D E
> |\|
> H C B
> \|/
> A
> EOF
$ hg rebase -s C --dest H --collapse
abort: unable to collapse on top of 3, there is more than one external parent: 1, 6
indygregUnsubmitted
Not Done

Are we really printing revision numbers here?!

indygreg: Are we really printing revision numbers here?!
[255] [255]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge $ hg rebase -s E --dest I --collapse # root (E) is not a merge
rebasing 4:8a5212ebc852 "E" abort: unknown revision 'I'!
rebasing 5:7f219660301f "F" [255]
rebasing 6:c772a8b2dc17 "G"
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg
$ hg tglog $ hg tglog
o 5: f97c4725bd99 'Collapsed revision o 7: 64e264db77f0 'G'
|\ * E |\
| | * F | o 6: 11abe3fb10b8 'F'
| | * G' | |
| @ 4: c65502d41787 'H' | o 5: 49cb92066bfd 'E'
| | | |
o | 3: 2870ad076e54 'D' o | 4: 4e4f9194f9f1 'D'
|\ \ |\|
| o | 2: c5cefa58fd55 'C' | | o 3: 575c4b5ec114 'H'
| |/ | | |
o / 1: 27547f69f254 'B' o---+ 2: dc0947a82db8 'C'
/ /
o / 1: 112478962961 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B
C C
D
E E
F F
H
$ cd .. $ cd ..
Test that branchheads cache is updated correctly when doing a strip in which Test that branchheads cache is updated correctly when doing a strip in which
the parent of the ancestor node to be stripped does not become a head and also, the parent of the ancestor node to be stripped does not become a head and also,
the parent of a node that is a child of the node stripped becomes a head (node the parent of a node that is a child of the node stripped becomes a head (node
3). The code is now much simpler and we could just test a simpler scenario 3). The code is now much simpler and we could just test a simpler scenario
We keep it the test this way in case new complexity is injected. We keep it the test this way in case new complexity is injected.
$ hg clone -q -u . b b2 Create repo b:
$ cd b2
$ hg init branch-heads
$ cd branch-heads
$ hg debugdrawdag << 'EOF'
> G
> |\
> | F
> | |
> D E
> |\|
> H C B
> \|/
> A
> EOF
$ hg heads --template="{rev}:{node} {branch}\n" $ hg heads --template="{rev}:{node} {branch}\n"
7:c65502d4178782309ce0574c5ae6ee9485a9bafa default 7:64e264db77f061f16d9132b70c5a58e2461fb630 default
6:c772a8b2dc17629cec88a19d09c926c4814b12c7 default 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default
$ cat $TESTTMP/b2/.hg/cache/branch2-served $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 7 64e264db77f061f16d9132b70c5a58e2461fb630 7
c772a8b2dc17629cec88a19d09c926c4814b12c7 o default 575c4b5ec114d64b681d33f8792853568bfb2b2c o default
c65502d4178782309ce0574c5ae6ee9485a9bafa o default 64e264db77f061f16d9132b70c5a58e2461fb630 o default
$ hg strip 4 $ hg strip 4
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg
$ cat $TESTTMP/b2/.hg/cache/branch2-served $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 4 11abe3fb10b8689b560681094b17fe161871d043 5
2870ad076e541e714f3c2bc32826b5c6a6e5b040 o default dc0947a82db884575bb76ea10ac97b08536bfa03 o default
c65502d4178782309ce0574c5ae6ee9485a9bafa o default 575c4b5ec114d64b681d33f8792853568bfb2b2c o default
11abe3fb10b8689b560681094b17fe161871d043 o default
$ hg heads --template="{rev}:{node} {branch}\n" $ hg heads --template="{rev}:{node} {branch}\n"
4:c65502d4178782309ce0574c5ae6ee9485a9bafa default 5:11abe3fb10b8689b560681094b17fe161871d043 default
3:2870ad076e541e714f3c2bc32826b5c6a6e5b040 default 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default
2:dc0947a82db884575bb76ea10ac97b08536bfa03 default
$ cd .. $ cd ..
Preserves external parent
$ hg init external-parent
$ cd external-parent
$ hg debugdrawdag << 'EOF'
> H
> |\
> | G
> | |
> | F # F/E = F\n
> | |
> D E # D/D = D\n
> |\|
> I C B
> \|/
> A
> EOF
Create repo c: $ hg rebase -s F --dest I --collapse # root (F) is not a merge
rebasing 6:c82b08f646f1 "F" (F)
$ hg init c rebasing 7:a6db7fa104e1 "G" (G)
$ cd c rebasing 8:e1d201b72d91 "H" (H tip)
saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg
$ echo A > A
$ hg ci -Am A
adding A
$ echo B > B
$ hg ci -Am B
adding B
$ hg up -q 0
$ echo C > C
$ hg ci -Am C
adding C
created new head
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ echo D > D
$ hg ci -Am D
adding D
$ hg up -q 1
$ echo E > E
$ hg ci -Am E
adding E
created new head
$ echo F > E
$ hg ci -m 'F'
$ echo G > G
$ hg ci -Am G
adding G
$ hg merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m H
$ hg up -q 0
$ echo I > I
$ hg ci -Am I
adding I
created new head
$ hg tglog $ hg tglog
@ 8: 46d6f0e29c20 'I' o 6: 681daa3e686d 'Collapsed revision
| |\ * F
| o 7: 417d3b648079 'H' | | * G
| |\ | | * H'
| | o 6: 55a44ad28289 'G' | | o 5: 49cb92066bfd 'E'
| | |
| | o 5: dca5924bb570 'F'
| | |
| | o 4: 8a5212ebc852 'E'
| | | | | |
| o | 3: 2870ad076e54 'D' | o | 4: 09143c0bf13e 'D'
| |\| | |\|
| o | 2: c5cefa58fd55 'C' o | | 3: 08ebfeb61bac 'I'
| | |
| o | 2: dc0947a82db8 'C'
|/ / |/ /
| o 1: 27547f69f254 'B' | o 1: 112478962961 'B'
|/
o 0: 4a2df7238c3b 'A'
$ cd ..
Rebase and collapse - E onto I:
$ hg clone -q -u . c c1
$ cd c1
$ hg rebase -s 4 --dest 8 --collapse # root (4) is not a merge
rebasing 4:8a5212ebc852 "E"
rebasing 5:dca5924bb570 "F"
merging E
rebasing 6:55a44ad28289 "G"
rebasing 7:417d3b648079 "H"
saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg
$ hg tglog
o 5: 340b34a63b39 'Collapsed revision
|\ * E
| | * F
| | * G
| | * H'
| @ 4: 46d6f0e29c20 'I'
| |
o | 3: 2870ad076e54 'D'
|\ \
| o | 2: c5cefa58fd55 'C'
| |/
o / 1: 27547f69f254 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C C
D D
E E
F
G G
I I
$ hg up tip -q $ hg up tip -q
$ cat E $ cat E
F F
$ cd .. $ cd ..
Create repo d: With internal merge:
$ hg init d
$ cd d
$ echo A > A
$ hg ci -Am A
adding A
$ echo B > B
$ hg ci -Am B
adding B
$ echo C > C
$ hg ci -Am C
adding C
$ hg up -q 1
$ echo D > D
$ hg ci -Am D
adding D
created new head
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m E
$ hg up -q 0
$ echo F > F
$ hg ci -Am F
adding F
created new head
$ hg tglog
@ 5: c137c2b8081f 'F'
|
| o 4: 0a42590ed746 'E'
| |\
| | o 3: 7bbcd6078bcc 'D'
| | |
| o | 2: f838bfaca5c7 'C'
| |/
| o 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
$ cd ..
$ hg init internal-merge
$ cd internal-merge
Rebase and collapse - B onto F: $ hg debugdrawdag << 'EOF'
> E
> |\
> C D
> |/
> F B
> |/
> A
> EOF
$ hg clone -q -u . d d1
$ cd d1
$ hg rebase -s 1 --collapse --dest 5 $ hg rebase -s B --collapse --dest F
rebasing 1:27547f69f254 "B" rebasing 1:112478962961 "B" (B)
rebasing 2:f838bfaca5c7 "C" rebasing 3:26805aba1e60 "C" (C)
rebasing 3:7bbcd6078bcc "D" rebasing 4:be0ef73c17ad "D" (D)
rebasing 4:0a42590ed746 "E" rebasing 5:02c4367d6973 "E" (E tip)
saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg
$ hg tglog $ hg tglog
o 2: b72eaccb283f 'Collapsed revision o 2: c0512a1797b0 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| * E' | * E'
@ 1: c137c2b8081f 'F' o 1: 8908a377a434 'F'
| |
o 0: 4a2df7238c3b 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
F F
$ cd ..
Interactions between collapse and keepbranches Interactions between collapse and keepbranches
$ cd ..
$ hg init e $ hg init e
$ cd e $ cd e
$ echo 'a' > a $ echo 'a' > a
$ hg ci -Am 'A' $ hg ci -Am 'A'
adding a adding a
$ hg branch 'one' $ hg branch 'one'
marked working directory as branch one marked working directory as branch one
$ cd .. $ cd ..
Test stripping a revision with another child Test stripping a revision with another child
$ hg init f $ hg init f
$ cd f $ cd f
$ echo A > A $ hg debugdrawdag << 'EOF'
$ hg ci -Am A > C B
adding A > |/
$ echo B > B > A
$ hg ci -Am B > EOF
adding B
$ hg up -q 0
$ echo C > C
$ hg ci -Am C
adding C
created new head
$ hg tglog
@ 2: c5cefa58fd55 'C'
|
| o 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
$ hg heads --template="{rev}:{node} {branch}: {desc}\n" $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C 2:dc0947a82db884575bb76ea10ac97b08536bfa03 default: C
1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B 1:112478962961147124edd43549aedd1a335e44bf default: B
$ hg strip 2 $ hg strip C
0 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to $TESTTMP/f/.hg/strip-backup/dc0947a82db8-d21b92a4-backup.hg
saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg
$ hg tglog $ hg tglog
o 1: 27547f69f254 'B' o 1: 112478962961 'B'
| |
@ 0: 4a2df7238c3b 'A' o 0: 426bada5c675 'A'
$ hg heads --template="{rev}:{node} {branch}: {desc}\n" $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B 1:112478962961147124edd43549aedd1a335e44bf default: B
$ cd .. $ cd ..
Test collapsing changes that add then remove a file Test collapsing changes that add then remove a file
$ hg init collapseaddremove $ hg init collapseaddremove
$ cd collapseaddremove $ cd collapseaddremove
$ cd .. $ cd ..
Test that rebase --collapse will remember message after Test that rebase --collapse will remember message after
running into merge conflict and invoking rebase --continue. running into merge conflict and invoking rebase --continue.
$ hg init collapse_remember_message $ hg init collapse_remember_message
$ cd collapse_remember_message $ cd collapse_remember_message
$ touch a $ hg debugdrawdag << 'EOF'
$ hg add a > C B # B/A = B\n
$ hg commit -m "a" > |/ # C/A = C\n
$ echo "a-default" > a > A
$ hg commit -m "a-default" > EOF
$ hg update -r 0 $ hg rebase --collapse -m "new message" -b B -d C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved rebasing 1:81e5401e4d37 "B" (B)
$ hg branch dev merging A
marked working directory as branch dev warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
(branches are permanent and global, did you want a bookmark?)
$ echo "a-dev" > a
$ hg commit -m "a-dev"
$ hg rebase --collapse -m "a-default-dev" -d 1
rebasing 2:b8d8db2b242d "a-dev" (tip)
merging a
warning: conflicts while merging a! (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]
$ rm a.orig $ rm A.orig
$ hg resolve --mark a $ hg resolve --mark A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 2:b8d8db2b242d "a-dev" (tip) rebasing 1:81e5401e4d37 "B" (B)
saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg
$ hg log $ hg log
changeset: 2:45ba1d1a8665 changeset: 2:17186933e123
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a-default-dev summary: new message
changeset: 1:3c8db56a44bc changeset: 1:043039e9df84
tag: C
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a-default summary: C
changeset: 0:3903775176ed changeset: 0:426bada5c675
tag: A
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: A
$ cd .. $ cd ..