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

equal deleted inserted replaced

-:852620fe4ca7
+:235d58aa723e
 Enable obsolete
 $ cat >> $HGRCPATH << EOF
 > [ui]
-> logtemplate= {rev}:{node|short} {desc|firstline}
+> logtemplate= {rev}:{node|short} {desc|firstline}{if(obsolete,' ({obsfate})')}
 > [experimental]
 > evolution.createmarkers=True
 > evolution.allowunstable=True
 > [phases]
 > publish=False
 |\|
 | o  5:24b6387c8c8c F
 | |
 o |  4:9520eea781bc E
 |/
-| x  3:32af7686d403 D
+| x  3:32af7686d403 D (rewritten using rebase as 10:8eeb3c33ad33)
 | |
-| x  2:5fddd98957c8 C
+| x  2:5fddd98957c8 C (rewritten using rebase as 9:2327fea05063)
 | |
-| x  1:42ccdea3bb16 B
+| x  1:42ccdea3bb16 B (rewritten using rebase as 8:e4e5be0395b2)
 |/
 o  0:cd010b8cd998 A
 $ hg debugobsolete
 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
 |\|
 | o  5:24b6387c8c8c F
 | |
 o |  4:9520eea781bc E
 |/
-| x  3:32af7686d403 D
+| x  3:32af7686d403 D (pruned using rebase)
 | |
-| x  2:5fddd98957c8 C
+| x  2:5fddd98957c8 C (rewritten using rebase as 10:5ae4c968c6ac)
 | |
-| x  1:42ccdea3bb16 B
+| x  1:42ccdea3bb16 B (pruned using rebase)
 |/
 o  0:cd010b8cd998 A
 $ hg debugobsolete
 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
 $ hg log -G
 @  11:4596109a6a43 D
 |
 | o  10:5ae4c968c6ac C
 | |
-| x  9:08483444fef9 D
+| x  9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43)
 | |
 | o  8:8877864f1edb B
 | |
 o |  7:02de42196ebe H
 | |
 | |/
 | o  5:24b6387c8c8c F
 | |
 o |  4:9520eea781bc E
 |/
-| @  1:42ccdea3bb16 B
+| @  1:42ccdea3bb16 B (pruned using rebase)
 |/
 o  0:cd010b8cd998 A
 $ cd ..
 |\|
 | o  5:24b6387c8c8c F
 | |
 o |  4:9520eea781bc E
 |/
-| x  3:32af7686d403 D
+| x  3:32af7686d403 D (rewritten using rebase as 8:4dc2197e807b)
 | |
-| x  2:5fddd98957c8 C
+| x  2:5fddd98957c8 C (rewritten using rebase as 8:4dc2197e807b)
 | |
-| x  1:42ccdea3bb16 B
+| x  1:42ccdea3bb16 B (rewritten using rebase as 8:4dc2197e807b)
 |/
 o  0:cd010b8cd998 A
 $ hg id --debug -r tip
 4dc2197e807bae9817f09905b50ab288be2dbbcf tip
 |/|
 o |  5:24b6387c8c8c F
 | |
 | o  4:9520eea781bc E
 |/
-| x  3:32af7686d403 D
+| x  3:32af7686d403 D (rewritten using rebase as 9:cf44d2f5a9f4)
 | |
-| x  2:5fddd98957c8 C
+| x  2:5fddd98957c8 C (rewritten using rebase as 8:e273c5e7d2d2)
 | |
-| x  1:42ccdea3bb16 B
+| x  1:42ccdea3bb16 B (rewritten using rebase as 10:7c6027df6a99)
 |/
 o  0:cd010b8cd998 A
 $ hg debugobsolete
 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
 |
 o  10:7c6027df6a99 B
 |
 | o  9:cf44d2f5a9f4 D
 | |
-| x  8:e273c5e7d2d2 C
+| x  8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c)
 | |
 @ |  7:02de42196ebe H
 | |
 | o  6:eea13746799a G
 |/|
 |
 | o  12:102b4c1d889b D
 |/
 | o  10:7c6027df6a99 B
 | |
-| x  7:02de42196ebe H
+| x  7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697)
 | |
 +---o  6:eea13746799a G
 | |/
 | o  5:24b6387c8c8c F
 | |
 |
 | o  10:b5313c85b22e D
 |/
 | o    8:53a6a128b2b7 M
 | |\
-| | x  7:02de42196ebe H
+| | x  7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
 | | |
 o---+  6:eea13746799a G
 | | |
 | | o  5:24b6387c8c8c F
 | | |
 o---+  4:9520eea781bc E
 / /
-x |  3:32af7686d403 D
+x |  3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
 | |
 o |  2:5fddd98957c8 C
 | |
 o |  1:42ccdea3bb16 B
 |/
 | |
 o |  10:b5313c85b22e D
 |/
 | o    8:53a6a128b2b7 M
 | |\
-| | x  7:02de42196ebe H
+| | x  7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
 | | |
 o---+  6:eea13746799a G
 | | |
 | | o  5:24b6387c8c8c F
 | | |
 o---+  4:9520eea781bc E
 / /
-x |  3:32af7686d403 D
+x |  3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
 | |
 o |  2:5fddd98957c8 C
 | |
 o |  1:42ccdea3bb16 B
 |/
 $ hg log -G
 @  18:bfaedf8eb73b M
 |
 | o  17:97219452e4bd L
 | |
-| x  16:fc37a630c901 K
+| x  16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
 |/
 | o  15:5ae8a643467b J
 | |
-| x  14:9ad579b4a5de I
+| x  14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
 |/
 | o  12:acd174b7ab39 I
 | |
 | o  11:6c11a6218c97 H
 | |
 o |  10:b5313c85b22e D
 |/
 | o    8:53a6a128b2b7 M
 | |\
-| | x  7:02de42196ebe H
+| | x  7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
 | | |
 o---+  6:eea13746799a G
 | | |
 | | o  5:24b6387c8c8c F
 | | |
 o---+  4:9520eea781bc E
 / /
-x |  3:32af7686d403 D
+x |  3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
 | |
 o |  2:5fddd98957c8 C
 | |
 o |  1:42ccdea3bb16 B
 |/
 |
 | o  13:77d874d096a2 10'
 | |
 | | o  12:3eb461388009 john doe
 | |/
-x |  10:121d9e3bc4c6 P
+x |  10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
 |/
 o  9:4be60e099a77 C
 |
 o  6:9c48361117de D
 |
 |
 | o  13:77d874d096a2 10'
 | |
 | | o  12:3eb461388009 john doe
 | |/
-x |  10:121d9e3bc4c6 P
+x |  10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
 |/
 o  9:4be60e099a77 C
 |
 o  6:9c48361117de D
 |
 obsoleted 1 changesets
 $ hg log -G -r 16::
 @  21:7bdc8a87673d dummy change
 |
-x  20:8b31da3c4919 dummy change
+x  20:8b31da3c4919 dummy change (rewritten as 18:601db7a18f51)
 |
 o  19:b82fb57ea638 willconflict second version
 |
 | o  18:601db7a18f51 dummy change successor
 | |
 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
 rebasing 4:66f1a38021c9 "F" (F tip)
 $ hg log -G
 o    5:50e9d60b99c6 F
 |\
-| | x  4:66f1a38021c9 F
+| | x  4:66f1a38021c9 F (rewritten using rebase as 5:50e9d60b99c6)
 | |/|
 | o |  3:7fb047a69f22 E
 | | |
-| | x  2:b18e25de2cf5 D
+| | x  2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
 | |/
 o |  1:112478962961 B
 |/
 o  0:426bada5c675 A
 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
 rebasing 4:66f1a38021c9 "F" (F tip)
 $ hg log -G
 o    5:aae1787dacee F
 |\
-| | x  4:66f1a38021c9 F
+| | x  4:66f1a38021c9 F (rewritten using rebase as 5:aae1787dacee)
 | |/|
-| | x  3:7fb047a69f22 E
+| | x  3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
 | | |
 | o |  2:b18e25de2cf5 D
 | |/
 o /  1:112478962961 B
 |/
 rebasing 5:66f1a38021c9 "F" (F tip)
 $ hg log -G
 o    6:0913febf6439 F
 |\
-+---x  5:66f1a38021c9 F
++---x  5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439)
 | | |
 | o |  4:26805aba1e60 C
 | | |
 o | |  3:7fb047a69f22 E
 | | |
-+---x  2:b18e25de2cf5 D
++---x  2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
 | |
 | o  1:112478962961 B
 |/
 o  0:426bada5c675 A
 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
 rebasing 5:66f1a38021c9 "F" (F tip)
 $ hg log -G
 o    6:c6ab0cc6d220 F
 |\
-+---x  5:66f1a38021c9 F
++---x  5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220)
 | | |
 | o |  4:26805aba1e60 C
 | | |
-| | x  3:7fb047a69f22 E
+| | x  3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
 | | |
 o---+  2:b18e25de2cf5 D
 / /
 o /  1:112478962961 B
 |/
 rebasing 5:66f1a38021c9 "F" (F tip)
 note: rebase of 5:66f1a38021c9 created no changes to commit
 $ hg log -G
 o  6:8f47515dda15 D
 |
-| x    5:66f1a38021c9 F
+| x    5:66f1a38021c9 F (pruned using rebase)
 | |\
 o | |  4:26805aba1e60 C
 | | |
-| | x  3:7fb047a69f22 E
+| | x  3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
 | | |
-| x |  2:b18e25de2cf5 D
+| x |  2:b18e25de2cf5 D (rewritten using rebase as 6:8f47515dda15)
 | |/
 o /  1:112478962961 B
 |/
 o  0:426bada5c675 A
 note: rebase of 5:66f1a38021c9 created no changes to commit
 $ hg log -G
 o  6:533690786a86 E
 |
-| x    5:66f1a38021c9 F
+| x    5:66f1a38021c9 F (pruned using rebase)
 | |\
 o | |  4:26805aba1e60 C
 | | |
-| | x  3:7fb047a69f22 E
+| | x  3:7fb047a69f22 E (rewritten using rebase as 6:533690786a86)
 | | |
-| x |  2:b18e25de2cf5 D
+| x |  2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
 | |/
 o /  1:112478962961 B
 |/
 o  0:426bada5c675 A
 $ hg log -r .  # working dir is at rev 3 (successor of 2)
 3:be1832deae9a b (no-eol)
 $ hg book -r 2 mybook --hidden  # rev 2 has a bookmark on it now
 $ hg up 2 && hg log -r .  # working dir is at rev 2 again
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-2:1e9a3c00cbe9 b (no-eol)
+2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
 Check that working directory and bookmark was updated to rev 3 although rev 2
 was skipped
 $ hg log -r .
 $ cp -R . $TESTTMP/hidden-state2
 $ hg log -G
 @  2:b18e25de2cf5 D
 |
-| @  1:2ec65233581b B
+| @  1:2ec65233581b B (pruned using prune)
 |/
 o  0:426bada5c675 A
 $ hg summary
 parent: 2:b18e25de2cf5 tip

changeset 35056	235d58aa723e
parent 35055	852620fe4ca7
child 35057	0564e7c7f4cd