Mercurial > hg

comparison tests/test-rebase-scenario-global.out @ 11203:7a9cf012dddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: only show "rebase completed" message with -v
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 15:15:11 -0500
parents f974fe896921
children
comparison
equal deleted inserted replaced
11202:f974fe896921 11203:7a9cf012dddc
11 o 0: A 11 o 0: A
12 12
13 % Rebasing 13 % Rebasing
14 % B onto F - simple rebase 14 % B onto F - simple rebase
15 saved backup bundle to 15 saved backup bundle to
16 rebase completed
17 @ 5: B 16 @ 5: B
18 | 17 |
19 o 4: F 18 o 4: F
20 | 19 |
21 | o 3: E 20 | o 3: E
26 |/ 25 |/
27 o 0: A 26 o 0: A
28 27
29 % B onto D - intermediate point 28 % B onto D - intermediate point
30 saved backup bundle to 29 saved backup bundle to
31 rebase completed
32 @ 5: B 30 @ 5: B
33 | 31 |
34 | o 4: F 32 | o 4: F
35 |/ 33 |/
36 | o 3: E 34 | o 3: E
41 |/ 39 |/
42 o 0: A 40 o 0: A
43 41
44 % C onto F - skip of E 42 % C onto F - skip of E
45 saved backup bundle to 43 saved backup bundle to
46 rebase completed
47 @ 4: C 44 @ 4: C
48 | 45 |
49 o 3: F 46 o 3: F
50 | 47 |
51 o 2: D 48 o 2: D
54 |/ 51 |/
55 o 0: A 52 o 0: A
56 53
57 % D onto C - rebase of a branching point (skip E) 54 % D onto C - rebase of a branching point (skip E)
58 saved backup bundle to 55 saved backup bundle to
59 rebase completed
60 @ 4: F 56 @ 4: F
61 | 57 |
62 o 3: D 58 o 3: D
63 | 59 |
64 o 2: C 60 o 2: C
67 |/ 63 |/
68 o 0: A 64 o 0: A
69 65
70 % E onto F - merged revision having a parent in ancestors of target 66 % E onto F - merged revision having a parent in ancestors of target
71 saved backup bundle to 67 saved backup bundle to
72 rebase completed
73 @ 5: E 68 @ 5: E
74 |\ 69 |\
75 | o 4: F 70 | o 4: F
76 | | 71 | |
77 | o 3: D 72 | o 3: D
82 |/ 77 |/
83 o 0: A 78 o 0: A
84 79
85 % D onto B - E maintains C as parent 80 % D onto B - E maintains C as parent
86 saved backup bundle to 81 saved backup bundle to
87 rebase completed
88 @ 5: F 82 @ 5: F
89 | 83 |
90 | o 4: E 84 | o 4: E
91 |/| 85 |/|
92 o | 3: D 86 o | 3: D