Show More
@@ -10,41 +10,32 b'' | |||||
10 |
|
10 | |||
11 | $ hg init a |
|
11 | $ hg init a | |
12 | $ cd a |
|
12 | $ cd a | |
13 |
|
13 | $ hg unbundle $TESTDIR/bundles/rebase.hg | ||
14 | $ echo A > A |
|
14 | adding changesets | |
15 | $ hg ci -Am A |
|
15 | adding manifests | |
16 | adding A |
|
16 | adding file changes | |
17 |
|
17 | added 8 changesets with 7 changes to 7 files (+2 heads) | ||
18 | $ echo B > B |
|
18 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
19 | $ hg ci -Am B |
|
19 | $ hg up tip | |
20 | adding B |
|
20 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 |
|
||||
22 | $ echo C > C |
|
|||
23 | $ hg ci -Am C |
|
|||
24 | adding C |
|
|||
25 |
|
||||
26 | $ echo D > D |
|
|||
27 | $ hg ci -Am D |
|
|||
28 | adding D |
|
|||
29 |
|
||||
30 | $ hg up -q -C 0 |
|
|||
31 |
|
||||
32 | $ echo E > E |
|
|||
33 | $ hg ci -Am E |
|
|||
34 | adding E |
|
|||
35 | created new head |
|
|||
36 |
|
21 | |||
37 | $ cd .. |
|
22 | $ cd .. | |
38 |
|
23 | |||
39 |
|
24 | |||
40 |
Rebasing D onto |
|
25 | Rebasing D onto H detaching from C: | |
41 |
|
26 | |||
42 | $ hg clone -q -u . a a1 |
|
27 | $ hg clone -q -u . a a1 | |
43 | $ cd a1 |
|
28 | $ cd a1 | |
44 |
|
29 | |||
45 | $ hg tglog |
|
30 | $ hg tglog | |
46 |
@ |
|
31 | @ 7: 'H' | |
47 | | |
|
32 | | | |
|
33 | | o 6: 'G' | |||
|
34 | |/| | |||
|
35 | o | 5: 'F' | |||
|
36 | | | | |||
|
37 | | o 4: 'E' | |||
|
38 | |/ | |||
48 | | o 3: 'D' |
|
39 | | o 3: 'D' | |
49 | | | |
|
40 | | | | |
50 | | o 2: 'C' |
|
41 | | o 2: 'C' | |
@@ -53,14 +44,20 b' Rebasing D onto E detaching from C:' | |||||
53 | |/ |
|
44 | |/ | |
54 | o 0: 'A' |
|
45 | o 0: 'A' | |
55 |
|
46 | |||
56 |
$ hg rebase --detach -s 3 -d |
|
47 | $ hg rebase --detach -s 3 -d 7 | |
57 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
48 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
58 |
|
49 | |||
59 | $ hg tglog |
|
50 | $ hg tglog | |
60 |
@ |
|
51 | @ 7: 'D' | |
|
52 | | | |||
|
53 | o 6: 'H' | |||
61 | | |
|
54 | | | |
62 |
o |
|
55 | | o 5: 'G' | |
63 | | |
|
56 | |/| | |
|
57 | o | 4: 'F' | |||
|
58 | | | | |||
|
59 | | o 3: 'E' | |||
|
60 | |/ | |||
64 | | o 2: 'C' |
|
61 | | o 2: 'C' | |
65 | | | |
|
62 | | | | |
66 | | o 1: 'B' |
|
63 | | o 1: 'B' | |
@@ -70,19 +67,26 b' Rebasing D onto E detaching from C:' | |||||
70 | $ hg manifest |
|
67 | $ hg manifest | |
71 | A |
|
68 | A | |
72 | D |
|
69 | D | |
73 |
|
|
70 | F | |
|
71 | H | |||
74 |
|
72 | |||
75 | $ cd .. |
|
73 | $ cd .. | |
76 |
|
74 | |||
77 |
|
75 | |||
78 |
Rebasing C onto |
|
76 | Rebasing C onto H detaching from B: | |
79 |
|
77 | |||
80 | $ hg clone -q -u . a a2 |
|
78 | $ hg clone -q -u . a a2 | |
81 | $ cd a2 |
|
79 | $ cd a2 | |
82 |
|
80 | |||
83 | $ hg tglog |
|
81 | $ hg tglog | |
84 |
@ |
|
82 | @ 7: 'H' | |
85 | | |
|
83 | | | |
|
84 | | o 6: 'G' | |||
|
85 | |/| | |||
|
86 | o | 5: 'F' | |||
|
87 | | | | |||
|
88 | | o 4: 'E' | |||
|
89 | |/ | |||
86 | | o 3: 'D' |
|
90 | | o 3: 'D' | |
87 | | | |
|
91 | | | | |
88 | | o 2: 'C' |
|
92 | | o 2: 'C' | |
@@ -91,16 +95,22 b' Rebasing C onto E detaching from B:' | |||||
91 | |/ |
|
95 | |/ | |
92 | o 0: 'A' |
|
96 | o 0: 'A' | |
93 |
|
97 | |||
94 |
$ hg rebase --detach -s 2 -d |
|
98 | $ hg rebase --detach -s 2 -d 7 | |
95 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
|
99 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
96 |
|
100 | |||
97 | $ hg tglog |
|
101 | $ hg tglog | |
98 |
@ |
|
102 | @ 7: 'D' | |
|
103 | | | |||
|
104 | o 6: 'C' | |||
|
105 | | | |||
|
106 | o 5: 'H' | |||
99 | | |
|
107 | | | |
100 |
o |
|
108 | | o 4: 'G' | |
101 | | |
|
109 | |/| | |
102 |
o |
|
110 | o | 3: 'F' | |
103 | | |
|
111 | | | | |
|
112 | | o 2: 'E' | |||
|
113 | |/ | |||
104 | | o 1: 'B' |
|
114 | | o 1: 'B' | |
105 | |/ |
|
115 | |/ | |
106 | o 0: 'A' |
|
116 | o 0: 'A' | |
@@ -109,19 +119,26 b' Rebasing C onto E detaching from B:' | |||||
109 | A |
|
119 | A | |
110 | C |
|
120 | C | |
111 | D |
|
121 | D | |
112 |
|
|
122 | F | |
|
123 | H | |||
113 |
|
124 | |||
114 | $ cd .. |
|
125 | $ cd .. | |
115 |
|
126 | |||
116 |
|
127 | |||
117 |
Rebasing B onto |
|
128 | Rebasing B onto H using detach (same as not using it): | |
118 |
|
129 | |||
119 | $ hg clone -q -u . a a3 |
|
130 | $ hg clone -q -u . a a3 | |
120 | $ cd a3 |
|
131 | $ cd a3 | |
121 |
|
132 | |||
122 | $ hg tglog |
|
133 | $ hg tglog | |
123 |
@ |
|
134 | @ 7: 'H' | |
124 | | |
|
135 | | | |
|
136 | | o 6: 'G' | |||
|
137 | |/| | |||
|
138 | o | 5: 'F' | |||
|
139 | | | | |||
|
140 | | o 4: 'E' | |||
|
141 | |/ | |||
125 | | o 3: 'D' |
|
142 | | o 3: 'D' | |
126 | | | |
|
143 | | | | |
127 | | o 2: 'C' |
|
144 | | o 2: 'C' | |
@@ -130,18 +147,24 b' Rebasing B onto E using detach (same as ' | |||||
130 | |/ |
|
147 | |/ | |
131 | o 0: 'A' |
|
148 | o 0: 'A' | |
132 |
|
149 | |||
133 |
$ hg rebase --detach -s 1 -d |
|
150 | $ hg rebase --detach -s 1 -d 7 | |
134 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
151 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | |
135 |
|
152 | |||
136 | $ hg tglog |
|
153 | $ hg tglog | |
137 |
@ |
|
154 | @ 7: 'D' | |
138 | | |
|
155 | | | |
139 |
o |
|
156 | o 6: 'C' | |
|
157 | | | |||
|
158 | o 5: 'B' | |||
140 | | |
|
159 | | | |
141 |
o |
|
160 | o 4: 'H' | |
142 | | |
|
161 | | | |
143 |
o |
|
162 | | o 3: 'G' | |
144 | | |
|
163 | |/| | |
|
164 | o | 2: 'F' | |||
|
165 | | | | |||
|
166 | | o 1: 'E' | |||
|
167 | |/ | |||
145 | o 0: 'A' |
|
168 | o 0: 'A' | |
146 |
|
169 | |||
147 | $ hg manifest |
|
170 | $ hg manifest | |
@@ -149,19 +172,26 b' Rebasing B onto E using detach (same as ' | |||||
149 | B |
|
172 | B | |
150 | C |
|
173 | C | |
151 | D |
|
174 | D | |
152 |
|
|
175 | F | |
|
176 | H | |||
153 |
|
177 | |||
154 | $ cd .. |
|
178 | $ cd .. | |
155 |
|
179 | |||
156 |
|
180 | |||
157 |
Rebasing C onto |
|
181 | Rebasing C onto H detaching from B and collapsing: | |
158 |
|
182 | |||
159 | $ hg clone -q -u . a a4 |
|
183 | $ hg clone -q -u . a a4 | |
160 | $ cd a4 |
|
184 | $ cd a4 | |
161 |
|
185 | |||
162 | $ hg tglog |
|
186 | $ hg tglog | |
163 |
@ |
|
187 | @ 7: 'H' | |
164 | | |
|
188 | | | |
|
189 | | o 6: 'G' | |||
|
190 | |/| | |||
|
191 | o | 5: 'F' | |||
|
192 | | | | |||
|
193 | | o 4: 'E' | |||
|
194 | |/ | |||
165 | | o 3: 'D' |
|
195 | | o 3: 'D' | |
166 | | | |
|
196 | | | | |
167 | | o 2: 'C' |
|
197 | | o 2: 'C' | |
@@ -170,15 +200,21 b' Rebasing C onto E detaching from B and c' | |||||
170 | |/ |
|
200 | |/ | |
171 | o 0: 'A' |
|
201 | o 0: 'A' | |
172 |
|
202 | |||
173 |
$ hg rebase --detach --collapse -s 2 -d |
|
203 | $ hg rebase --detach --collapse -s 2 -d 7 | |
174 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
|
204 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | |
175 |
|
205 | |||
176 | $ hg tglog |
|
206 | $ hg tglog | |
177 |
@ |
|
207 | @ 6: 'Collapsed revision | |
178 | | * C |
|
208 | | * C | |
179 | | * D' |
|
209 | | * D' | |
180 |
o |
|
210 | o 5: 'H' | |
181 | | |
|
211 | | | |
|
212 | | o 4: 'G' | |||
|
213 | |/| | |||
|
214 | o | 3: 'F' | |||
|
215 | | | | |||
|
216 | | o 2: 'E' | |||
|
217 | |/ | |||
182 | | o 1: 'B' |
|
218 | | o 1: 'B' | |
183 | |/ |
|
219 | |/ | |
184 | o 0: 'A' |
|
220 | o 0: 'A' | |
@@ -187,7 +223,8 b' Rebasing C onto E detaching from B and c' | |||||
187 | A |
|
223 | A | |
188 | C |
|
224 | C | |
189 | D |
|
225 | D | |
190 |
|
|
226 | F | |
|
227 | H | |||
191 |
|
228 | |||
192 | $ cd .. |
|
229 | $ cd .. | |
193 |
|
230 | |||
@@ -204,10 +241,16 b' Rebasing across null as ancestor' | |||||
204 | created new head |
|
241 | created new head | |
205 |
|
242 | |||
206 | $ hg tglog |
|
243 | $ hg tglog | |
207 |
@ |
|
244 | @ 8: 'extra branch' | |
208 |
|
245 | |||
209 |
o |
|
246 | o 7: 'H' | |
210 | | |
|
247 | | | |
|
248 | | o 6: 'G' | |||
|
249 | |/| | |||
|
250 | o | 5: 'F' | |||
|
251 | | | | |||
|
252 | | o 4: 'E' | |||
|
253 | |/ | |||
211 | | o 3: 'D' |
|
254 | | o 3: 'D' | |
212 | | | |
|
255 | | | | |
213 | | o 2: 'C' |
|
256 | | o 2: 'C' | |
@@ -220,15 +263,21 b' Rebasing across null as ancestor' | |||||
220 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
|
263 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | |
221 |
|
264 | |||
222 | $ hg tglog |
|
265 | $ hg tglog | |
223 |
@ |
|
266 | @ 8: 'D' | |
224 | | |
|
267 | | | |
225 |
o |
|
268 | o 7: 'C' | |
|
269 | | | |||
|
270 | o 6: 'B' | |||
226 | | |
|
271 | | | |
227 | o 3: 'B' |
|
272 | o 5: 'extra branch' | |
|
273 | ||||
|
274 | o 4: 'H' | |||
228 | | |
|
275 | | | |
229 | o 2: 'extra branch' |
|
276 | | o 3: 'G' | |
230 |
|
277 | |/| | ||
231 |
o |
|
278 | o | 2: 'F' | |
232 | | |
|
279 | | | | |
|
280 | | o 1: 'E' | |||
|
281 | |/ | |||
233 | o 0: 'A' |
|
282 | o 0: 'A' | |
234 |
|
283 |
General Comments 0
You need to be logged in to leave comments.
Login now