mercurial: comparison tests/test-rebase-collapse.t

equal deleted inserted replaced

-:b9bdee046cc2
+:469b06b4c3ca
 >
 > [phases]
 > publish=False
 >
 > [alias]
-> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+> tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
-> tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
+> tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
 > EOF
 Create repo a:
 $ hg init a
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hg up tip
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg tglog
-@  7: 'H'
+@  7: 02de42196ebe 'H'
 |
-| o  6: 'G'
+| o  6: eea13746799a 'G'
 |/|
-o |  5: 'F'
+o |  5: 24b6387c8c8c 'F'
 | |
-| o  4: 'E'
+| o  4: 9520eea781bc 'E'
 |/
-| o  3: 'D'
+| o  3: 32af7686d403 'D'
 | |
-| o  2: 'C'
+| o  2: 5fddd98957c8 'C'
 | |
-| o  1: 'B'
+| o  1: 42ccdea3bb16 'B'
 |/
-o  0: 'A'
+o  0: cd010b8cd998 'A'
 $ cd ..
 Rebasing B onto H and collapsing changesets with different phases:
 HG: added D
 ====
 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
 $ hg tglogp
-@  5:secret 'Collapsed revision
+@  5: 30882080ba93 secret 'Collapsed revision
 |  * B
 |  * C
 |  * D
 |
 |
 |  edited manually'
-o  4:draft 'H'
+o  4: 02de42196ebe draft 'H'
 |
-| o  3:draft 'G'
+| o  3: eea13746799a draft 'G'
 |/|
-o |  2:draft 'F'
+o |  2: 24b6387c8c8c draft 'F'
 | |
-| o  1:draft 'E'
+| o  1: 9520eea781bc draft 'E'
 |/
-o  0:draft 'A'
+o  0: cd010b8cd998 draft 'A'
 $ hg manifest --rev tip
 A
 B
 C
 rebasing 4:9520eea781bc "E"
 rebasing 6:eea13746799a "G"
 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
 $ hg tglog
-o  6: 'Collapsed revision
+o  6: 7dd333a2d1e4 'Collapsed revision
 |  * E
 |  * G'
-@  5: 'H'
+@  5: 02de42196ebe 'H'
 |
-o  4: 'F'
+o  4: 24b6387c8c8c 'F'
 |
-| o  3: 'D'
+| o  3: 32af7686d403 'D'
 | |
-| o  2: 'C'
+| o  2: 5fddd98957c8 'C'
 | |
-| o  1: 'B'
+| o  1: 42ccdea3bb16 'B'
 |/
-o  0: 'A'
+o  0: cd010b8cd998 'A'
 $ hg manifest --rev tip
 A
 E
 F
 rebasing 6:eea13746799a "G"
 HGEDITFORM=rebase.collapse
 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
 $ hg tglog
-o  6: 'custom message'
+o  6: 38ed6a6b026b 'custom message'
 |
-@  5: 'H'
+@  5: 02de42196ebe 'H'
 |
-o  4: 'F'
+o  4: 24b6387c8c8c 'F'
 |
-| o  3: 'D'
+| o  3: 32af7686d403 'D'
 | |
-| o  2: 'C'
+| o  2: 5fddd98957c8 'C'
 | |
-| o  1: 'B'
+| o  1: 42ccdea3bb16 'B'
 |/
-o  0: 'A'
+o  0: cd010b8cd998 'A'
 $ hg manifest --rev tip
 A
 E
 F
 $ hg ci -Am H
 adding H
 created new head
 $ hg tglog
-@  7: 'H'
+@  7: c65502d41787 'H'
 |
-| o    6: 'G'
+| o    6: c772a8b2dc17 'G'
 | |\
-| | o  5: 'F'
+| | o  5: 7f219660301f 'F'
 | | |
-| | o  4: 'E'
+| | o  4: 8a5212ebc852 'E'
 | | |
-| o |  3: 'D'
+| o |  3: 2870ad076e54 'D'
 | |\|
-| o |  2: 'C'
+| o |  2: c5cefa58fd55 'C'
 |/ /
-| o  1: 'B'
+| o  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ cd ..
 Rebase and collapse - more than one external (fail):
 rebasing 5:7f219660301f "F"
 rebasing 6:c772a8b2dc17 "G"
 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob)
 $ hg tglog
-o    5: 'Collapsed revision
+o    5: f97c4725bd99 'Collapsed revision
 |\   * E
 | |  * F
 | |  * G'
-| @  4: 'H'
+| @  4: c65502d41787 'H'
 | |
-o |    3: 'D'
+o |    3: 2870ad076e54 'D'
 |\ \
-| o |  2: 'C'
+| o |  2: c5cefa58fd55 'C'
 | |/
-o /  1: 'B'
+o /  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ hg manifest --rev tip
 A
 C
 D
 $ hg ci -Am I
 adding I
 created new head
 $ hg tglog
-@  8: 'I'
+@  8: 46d6f0e29c20 'I'
 |
-| o    7: 'H'
+| o    7: 417d3b648079 'H'
 | |\
-| | o  6: 'G'
+| | o  6: 55a44ad28289 'G'
 | | |
-| | o  5: 'F'
+| | o  5: dca5924bb570 'F'
 | | |
-| | o  4: 'E'
+| | o  4: 8a5212ebc852 'E'
 | | |
-| o |  3: 'D'
+| o |  3: 2870ad076e54 'D'
 | |\|
-| o |  2: 'C'
+| o |  2: c5cefa58fd55 'C'
 |/ /
-| o  1: 'B'
+| o  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ cd ..
 Rebase and collapse - E onto I:
 rebasing 6:55a44ad28289 "G"
 rebasing 7:417d3b648079 "H"
 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob)
 $ hg tglog
-o    5: 'Collapsed revision
+o    5: 340b34a63b39 'Collapsed revision
 |\   * E
 | |  * F
 | |  * G
 | |  * H'
-| @  4: 'I'
+| @  4: 46d6f0e29c20 'I'
 | |
-o |    3: 'D'
+o |    3: 2870ad076e54 'D'
 |\ \
-| o |  2: 'C'
+| o |  2: c5cefa58fd55 'C'
 | |/
-o /  1: 'B'
+o /  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ hg manifest --rev tip
 A
 C
 D
 $ hg ci -Am F
 adding F
 created new head
 $ hg tglog
-@  5: 'F'
+@  5: c137c2b8081f 'F'
 |
-| o    4: 'E'
+| o    4: 0a42590ed746 'E'
 | |\
-| | o  3: 'D'
+| | o  3: 7bbcd6078bcc 'D'
 | | |
-| o |  2: 'C'
+| o |  2: f838bfaca5c7 'C'
 | |/
-| o  1: 'B'
+| o  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ cd ..
 Rebase and collapse - B onto F:
 rebasing 3:7bbcd6078bcc "D"
 rebasing 4:0a42590ed746 "E"
 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob)
 $ hg tglog
-o  2: 'Collapsed revision
+o  2: b72eaccb283f 'Collapsed revision
 |  * B
 |  * C
 |  * D
 |  * E'
-@  1: 'F'
+@  1: c137c2b8081f 'F'
 |
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ hg manifest --rev tip
 A
 B
 C
 $ echo 'd' > d
 $ hg ci -Am 'D'
 adding d
 $ hg tglog
-@  3: 'D'
+@  3: 41acb9dca9eb 'D'
 |
-| o  2: 'C' two
+| o  2: 8ac4a08debf1 'C' two
 | |
-| o  1: 'B' one
+| o  1: 1ba175478953 'B' one
 |/
-o  0: 'A'
+o  0: 1994f17a630e 'A'
 $ hg rebase --keepbranches --collapse -s 1 -d 3
 abort: cannot collapse multiple named branches
 [255]
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ repeatchange 3 "E" "user2"
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 $ hg tglog
-@  5: 'E'
+@  5: fbfb97b1089a 'E'
 |
-| o  4: 'E'
+| o  4: f338eb3c2c7c 'E'
 |/
-o  3: 'D'
+o  3: 41acb9dca9eb 'D'
 |
-| o  2: 'C' two
+| o  2: 8ac4a08debf1 'C' two
 | |
-| o  1: 'B' one
+| o  1: 1ba175478953 'B' one
 |/
-o  0: 'A'
+o  0: 1994f17a630e 'A'
 $ hg rebase -s 5 -d 4
 rebasing 5:fbfb97b1089a "E" (tip)
 note: rebase of 5:fbfb97b1089a created no changes to commit
 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob)
 $ hg tglog
-@  4: 'E'
+@  4: f338eb3c2c7c 'E'
 |
-o  3: 'D'
+o  3: 41acb9dca9eb 'D'
 |
-| o  2: 'C' two
+| o  2: 8ac4a08debf1 'C' two
 | |
-| o  1: 'B' one
+| o  1: 1ba175478953 'B' one
 |/
-o  0: 'A'
+o  0: 1994f17a630e 'A'
 $ hg export tip
 # HG changeset patch
 # User user1
 # Date 0 0
 added 4 changesets with 11 changes to 7 files (+1 heads)
 new changesets f447d5abf5ea:338e84e2e558
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hg up -q tip
 $ hg tglog
-@  3: 'move2'
+@  3: 338e84e2e558 'move2'
 |
-o  2: 'move1'
+o  2: 6e7340ee38c0 'move1'
 |
-| o  1: 'change'
+| o  1: 1352765a01d4 'change'
 |/
-o  0: 'add'
+o  0: f447d5abf5ea 'add'
 $ hg rebase --collapse -d 1
 rebasing 2:6e7340ee38c0 "move1"
 merging a and d to d
 merging b and e to e
 d (a)g (b)
 Test collapsing a middle revision in-place
 $ hg tglog
-@  2: 'Collapsed revision
+@  2: 64b456429f67 'Collapsed revision
 |  * move1
 |  * move2'
-o  1: 'change'
+o  1: 1352765a01d4 'change'
 |
-o  0: 'add'
+o  0: f447d5abf5ea 'add'
 $ hg rebase --collapse -r 1 -d 0
 abort: can't remove original changesets with unrebased descendants
 (use --keep to keep original changesets)
 [255]
 $ hg ci -Am C
 adding C
 created new head
 $ hg tglog
-@  2: 'C'
+@  2: c5cefa58fd55 'C'
 |
-| o  1: 'B'
+| o  1: 27547f69f254 'B'
 |/
-o  0: 'A'
+o  0: 4a2df7238c3b 'A'
 $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
 2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C
 $ hg strip 2
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob)
 $ hg tglog
-o  1: 'B'
+o  1: 27547f69f254 'B'
 |
-@  0: 'A'
+@  0: 4a2df7238c3b 'A'
 $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B

changeset 35385	469b06b4c3ca
parent 34661	eb586ed5d8ce
child 35393	4441705b7111