Mercurial > hg
comparison tests/test-rebase-scenario-global.out @ 6906:808f03f61ebe
Add rebase extension
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Mon, 18 Aug 2008 21:16:31 +0200 |
parents | |
children | 7b19cda0fa10 |
comparison
equal
deleted
inserted
replaced
6905:248e54a9456e | 6906:808f03f61ebe |
---|---|
1 @ 5: F | |
2 | | |
3 | o 4: E | |
4 |/| | |
5 o | 3: D | |
6 | | | |
7 | o 2: C | |
8 |/ | |
9 | o 1: B | |
10 |/ | |
11 o 0: A | |
12 | |
13 % Rebasing | |
14 % B onto F - simple rebase | |
15 saving bundle to | |
16 adding branch | |
17 adding changesets | |
18 adding manifests | |
19 adding file changes | |
20 added 5 changesets with 4 changes to 4 files (+1 heads) | |
21 rebase completed | |
22 @ 5: B | |
23 | | |
24 o 4: F | |
25 | | |
26 | o 3: E | |
27 |/| | |
28 o | 2: D | |
29 | | | |
30 | o 1: C | |
31 |/ | |
32 o 0: A | |
33 | |
34 % B onto D - intermediate point | |
35 saving bundle to | |
36 adding branch | |
37 adding changesets | |
38 adding manifests | |
39 adding file changes | |
40 added 5 changesets with 4 changes to 4 files (+2 heads) | |
41 rebase completed | |
42 @ 5: B | |
43 | | |
44 | o 4: F | |
45 |/ | |
46 | o 3: E | |
47 |/| | |
48 o | 2: D | |
49 | | | |
50 | o 1: C | |
51 |/ | |
52 o 0: A | |
53 | |
54 % C onto F - skip of E | |
55 nothing changed | |
56 saving bundle to | |
57 adding branch | |
58 adding changesets | |
59 adding manifests | |
60 adding file changes | |
61 added 3 changesets with 3 changes to 3 files (+1 heads) | |
62 rebase completed | |
63 @ 4: C | |
64 | | |
65 o 3: F | |
66 | | |
67 o 2: D | |
68 | | |
69 | o 1: B | |
70 |/ | |
71 o 0: A | |
72 | |
73 % D onto C - rebase of a branching point (skip E) | |
74 nothing changed | |
75 saving bundle to | |
76 adding branch | |
77 adding changesets | |
78 adding manifests | |
79 adding file changes | |
80 added 2 changesets with 2 changes to 2 files | |
81 rebase completed | |
82 @ 4: F | |
83 | | |
84 o 3: D | |
85 | | |
86 o 2: C | |
87 | | |
88 | o 1: B | |
89 |/ | |
90 o 0: A | |
91 | |
92 % E onto F - merged revision having a parent in ancestors of target | |
93 saving bundle to | |
94 adding branch | |
95 adding changesets | |
96 adding manifests | |
97 adding file changes | |
98 added 2 changesets with 1 changes to 1 files (-1 heads) | |
99 rebase completed | |
100 @ 5: E | |
101 |\ | |
102 | o 4: F | |
103 | | | |
104 | o 3: D | |
105 | | | |
106 o | 2: C | |
107 |/ | |
108 | o 1: B | |
109 |/ | |
110 o 0: A | |
111 | |
112 % D onto B - E maintains C as parent | |
113 saving bundle to | |
114 adding branch | |
115 adding changesets | |
116 adding manifests | |
117 adding file changes | |
118 added 3 changesets with 2 changes to 2 files | |
119 rebase completed | |
120 @ 5: F | |
121 | | |
122 | o 4: E | |
123 |/| | |
124 o | 3: D | |
125 | | | |
126 | o 2: C | |
127 | | | |
128 o | 1: B | |
129 |/ | |
130 o 0: A | |
131 | |
132 % These will fail | |
133 % E onto D - rebase onto an ancestor | |
134 abort: cannot rebase a descendant | |
135 % D onto E - rebase onto a descendant | |
136 abort: cannot rebase an ancestor | |
137 % E onto B - merge revision with both parents not in ancestors of target | |
138 abort: cannot use revision 4 as base, result would have 3 parents |