Show More
@@ -359,6 +359,13 def rebase(ui, repo, **opts): | |||
|
359 | 359 | # this should probably be cleaned up |
|
360 | 360 | targetnode = repo[target].node() |
|
361 | 361 | |
|
362 | # restore original working directory | |
|
363 | # (we do this before stripping) | |
|
364 | newwd = state.get(originalwd, originalwd) | |
|
365 | if newwd not in [c.rev() for c in repo[None].parents()]: | |
|
366 | ui.note(_("update back to initial working directory parent\n")) | |
|
367 | hg.updaterepo(repo, newwd, False) | |
|
368 | ||
|
362 | 369 | if not keepf: |
|
363 | 370 | collapsedas = None |
|
364 | 371 | if collapsef: |
@@ -119,9 +119,9 Keep active bookmark on the correct chan | |||
|
119 | 119 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
120 | 120 | |
|
121 | 121 | $ hg tglog |
|
122 |
|
|
|
122 | o 3: 'C' bookmarks: Y Z | |
|
123 | 123 | | |
|
124 |
|
|
|
124 | @ 2: 'B' bookmarks: X | |
|
125 | 125 | | |
|
126 | 126 | o 1: 'D' bookmarks: W |
|
127 | 127 | | |
@@ -130,7 +130,7 Keep active bookmark on the correct chan | |||
|
130 | 130 | rebase --continue with bookmarks present (issue3802) |
|
131 | 131 | |
|
132 | 132 | $ hg up 2 |
|
133 |
0 files updated, 0 files merged, |
|
|
133 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
134 | 134 | $ echo 'C' > c |
|
135 | 135 | $ hg add c |
|
136 | 136 | $ hg ci -m 'other C' |
@@ -121,11 +121,11 Rebase part of branch2 (5-6) onto branch | |||
|
121 | 121 | 0: 'A' |
|
122 | 122 | |
|
123 | 123 | $ hg tglog |
|
124 |
|
|
|
124 | o 8: 'E' branch3 | |
|
125 | 125 | | |
|
126 | 126 | o 7: 'D' branch3 |
|
127 | 127 | | |
|
128 |
|
|
|
128 | @ 6: 'F' branch3 | |
|
129 | 129 | | |
|
130 | 130 | o 5: 'branch3' branch3 |
|
131 | 131 | | |
@@ -80,11 +80,11 Solve the conflict and go on: | |||
|
80 | 80 | $ hg rebase --continue |
|
81 | 81 | |
|
82 | 82 | $ hg tglog |
|
83 |
|
|
|
83 | o 7:secret 'C' | |
|
84 | 84 | | |
|
85 | 85 | o 6:draft 'B' |
|
86 | 86 | | |
|
87 |
| |
|
|
87 | | @ 5:draft 'F' notdefault | |
|
88 | 88 | | | |
|
89 | 89 | o | 4:draft 'E' |
|
90 | 90 | | | |
@@ -57,11 +57,11 Rebasing B onto H and collapsing changes | |||
|
57 | 57 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
58 | 58 | |
|
59 | 59 | $ hg tglogp |
|
60 |
|
|
|
60 | o 5:secret 'Collapsed revision | |
|
61 | 61 | | * B |
|
62 | 62 | | * C |
|
63 | 63 | | * D' |
|
64 |
|
|
|
64 | @ 4:draft 'H' | |
|
65 | 65 | | |
|
66 | 66 | | o 3:draft 'G' |
|
67 | 67 | |/| |
@@ -92,10 +92,10 Rebasing E onto H: | |||
|
92 | 92 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
|
93 | 93 | |
|
94 | 94 | $ hg tglog |
|
95 |
|
|
|
95 | o 6: 'Collapsed revision | |
|
96 | 96 | | * E |
|
97 | 97 | | * G' |
|
98 |
|
|
|
98 | @ 5: 'H' | |
|
99 | 99 | | |
|
100 | 100 | o 4: 'F' |
|
101 | 101 | | |
@@ -128,9 +128,9 Rebasing G onto H with custom message: | |||
|
128 | 128 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
129 | 129 | |
|
130 | 130 | $ hg tglog |
|
131 |
|
|
|
131 | o 6: 'custom message' | |
|
132 | 132 | | |
|
133 |
|
|
|
133 | @ 5: 'H' | |
|
134 | 134 | | |
|
135 | 135 | o 4: 'F' |
|
136 | 136 | | |
@@ -235,11 +235,11 Rebase and collapse - E onto H: | |||
|
235 | 235 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob) |
|
236 | 236 | |
|
237 | 237 | $ hg tglog |
|
238 |
|
|
|
238 | o 5: 'Collapsed revision | |
|
239 | 239 | |\ * E |
|
240 | 240 | | | * F |
|
241 | 241 | | | * G' |
|
242 |
| |
|
|
242 | | @ 4: 'H' | |
|
243 | 243 | | | |
|
244 | 244 | o | 3: 'D' |
|
245 | 245 | |\ \ |
@@ -384,12 +384,12 Rebase and collapse - E onto I: | |||
|
384 | 384 | saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob) |
|
385 | 385 | |
|
386 | 386 | $ hg tglog |
|
387 |
|
|
|
387 | o 5: 'Collapsed revision | |
|
388 | 388 | |\ * E |
|
389 | 389 | | | * F |
|
390 | 390 | | | * G |
|
391 | 391 | | | * H' |
|
392 |
| |
|
|
392 | | @ 4: 'I' | |
|
393 | 393 | | | |
|
394 | 394 | o | 3: 'D' |
|
395 | 395 | |\ \ |
@@ -473,12 +473,12 Rebase and collapse - B onto F: | |||
|
473 | 473 | saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob) |
|
474 | 474 | |
|
475 | 475 | $ hg tglog |
|
476 |
|
|
|
476 | o 2: 'Collapsed revision | |
|
477 | 477 | | * B |
|
478 | 478 | | * C |
|
479 | 479 | | * D |
|
480 | 480 | | * E' |
|
481 |
|
|
|
481 | @ 1: 'F' | |
|
482 | 482 | | |
|
483 | 483 | o 0: 'A' |
|
484 | 484 | |
@@ -740,9 +740,9 Test collapsing changes that add then re | |||
|
740 | 740 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
741 | 741 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob) |
|
742 | 742 | $ hg tglog |
|
743 |
|
|
|
743 | o 1: 'collapsed' | |
|
744 | 744 | | |
|
745 |
|
|
|
745 | @ 0: 'base' | |
|
746 | 746 | |
|
747 | 747 | $ hg manifest --rev tip |
|
748 | 748 | b |
@@ -52,9 +52,9 Rebasing D onto H detaching from C: | |||
|
52 | 52 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
53 | 53 | |
|
54 | 54 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
55 |
|
|
|
55 | o 7:secret 'D' | |
|
56 | 56 | | |
|
57 |
|
|
|
57 | @ 6:draft 'H' | |
|
58 | 58 | | |
|
59 | 59 | | o 5:draft 'G' |
|
60 | 60 | |/| |
@@ -103,11 +103,11 Rebasing C onto H detaching from B: | |||
|
103 | 103 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
|
104 | 104 | |
|
105 | 105 | $ hg tglog |
|
106 |
|
|
|
106 | o 7: 'D' | |
|
107 | 107 | | |
|
108 | 108 | o 6: 'C' |
|
109 | 109 | | |
|
110 |
|
|
|
110 | @ 5: 'H' | |
|
111 | 111 | | |
|
112 | 112 | | o 4: 'G' |
|
113 | 113 | |/| |
@@ -155,13 +155,13 Rebasing B onto H using detach (same as | |||
|
155 | 155 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
156 | 156 | |
|
157 | 157 | $ hg tglog |
|
158 |
|
|
|
158 | o 7: 'D' | |
|
159 | 159 | | |
|
160 | 160 | o 6: 'C' |
|
161 | 161 | | |
|
162 | 162 | o 5: 'B' |
|
163 | 163 | | |
|
164 |
|
|
|
164 | @ 4: 'H' | |
|
165 | 165 | | |
|
166 | 166 | | o 3: 'G' |
|
167 | 167 | |/| |
@@ -209,10 +209,10 Rebasing C onto H detaching from B and c | |||
|
209 | 209 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
|
210 | 210 | |
|
211 | 211 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
212 |
|
|
|
212 | o 6:secret 'Collapsed revision | |
|
213 | 213 | | * C |
|
214 | 214 | | * D' |
|
215 |
|
|
|
215 | @ 5:draft 'H' | |
|
216 | 216 | | |
|
217 | 217 | | o 4:draft 'G' |
|
218 | 218 | |/| |
@@ -268,13 +268,13 Rebasing across null as ancestor | |||
|
268 | 268 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
|
269 | 269 | |
|
270 | 270 | $ hg tglog |
|
271 |
|
|
|
271 | o 8: 'D' | |
|
272 | 272 | | |
|
273 | 273 | o 7: 'C' |
|
274 | 274 | | |
|
275 | 275 | o 6: 'B' |
|
276 | 276 | | |
|
277 |
|
|
|
277 | @ 5: 'extra branch' | |
|
278 | 278 | |
|
279 | 279 | o 4: 'H' |
|
280 | 280 | | |
@@ -290,13 +290,13 Rebasing across null as ancestor | |||
|
290 | 290 | $ hg rebase -d 5 -s 7 |
|
291 | 291 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
|
292 | 292 | $ hg tglog |
|
293 |
|
|
|
293 | o 8: 'D' | |
|
294 | 294 | | |
|
295 | 295 | o 7: 'C' |
|
296 | 296 | | |
|
297 | 297 | | o 6: 'B' |
|
298 | 298 | |/ |
|
299 |
|
|
|
299 | @ 5: 'extra branch' | |
|
300 | 300 | |
|
301 | 301 | o 4: 'H' |
|
302 | 302 | | |
@@ -329,11 +329,11 Verify that target is not selected as ex | |||
|
329 | 329 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
|
330 | 330 | |
|
331 | 331 | $ hg tglog |
|
332 |
|
|
|
332 | o 8: 'Collapsed revision | |
|
333 | 333 | | * I |
|
334 | 334 | | * Merge |
|
335 | 335 | | * J' |
|
336 |
|
|
|
336 | @ 7: 'H' | |
|
337 | 337 | | |
|
338 | 338 | | o 6: 'G' |
|
339 | 339 | |/| |
@@ -110,13 +110,13 Solve the conflict and go on: | |||
|
110 | 110 | warning: new changesets detected on source branch, not stripping |
|
111 | 111 | |
|
112 | 112 | $ hg tglogp |
|
113 |
|
|
|
113 | o 7:draft 'C' | |
|
114 | 114 | | |
|
115 | 115 | | o 6:secret 'Extra' |
|
116 | 116 | | | |
|
117 | 117 | o | 5:draft 'B' |
|
118 | 118 | | | |
|
119 |
|
|
|
119 | @ | 4:draft 'E' | |
|
120 | 120 | | | |
|
121 | 121 | o | 3:draft 'D' |
|
122 | 122 | | | |
@@ -147,7 +147,7 Branch name containing a dash (issue3181 | |||
|
147 | 147 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
148 | 148 | |
|
149 | 149 | $ hg tglog |
|
150 |
|
|
|
150 | o 9: 'dev-two named branch' dev-two | |
|
151 | 151 | | |
|
152 | 152 | o 8: 'H' |
|
153 | 153 | | |
@@ -155,7 +155,7 Branch name containing a dash (issue3181 | |||
|
155 | 155 | |/| |
|
156 | 156 | o | 6: 'F' |
|
157 | 157 | | | |
|
158 |
|
|
|
158 | @ | 5: 'dev-one named branch' dev-one | |
|
159 | 159 | | | |
|
160 | 160 | | o 4: 'E' |
|
161 | 161 | | | |
@@ -171,7 +171,7 Branch name containing a dash (issue3181 | |||
|
171 | 171 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
172 | 172 | |
|
173 | 173 | $ hg tglog |
|
174 |
|
|
|
174 | o 8: 'dev-two named branch' dev-two | |
|
175 | 175 | | |
|
176 | 176 | o 7: 'H' |
|
177 | 177 | | |
@@ -187,7 +187,7 Branch name containing a dash (issue3181 | |||
|
187 | 187 | | | |
|
188 | 188 | | o 1: 'B' |
|
189 | 189 | |/ |
|
190 |
|
|
|
190 | @ 0: 'A' | |
|
191 | 191 | |
|
192 | 192 | |
|
193 | 193 | Rebasing descendant onto ancestor across different named branches |
@@ -196,7 +196,7 Rebasing descendant onto ancestor across | |||
|
196 | 196 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
197 | 197 | |
|
198 | 198 | $ hg tglog |
|
199 |
|
|
|
199 | o 8: 'D' | |
|
200 | 200 | | |
|
201 | 201 | o 7: 'C' |
|
202 | 202 | | |
@@ -212,7 +212,7 Rebasing descendant onto ancestor across | |||
|
212 | 212 | | | |
|
213 | 213 | | o 1: 'E' |
|
214 | 214 | |/ |
|
215 |
|
|
|
215 | @ 0: 'A' | |
|
216 | 216 | |
|
217 | 217 | $ hg rebase -s 4 -d 5 |
|
218 | 218 | abort: source is ancestor of destination |
@@ -222,7 +222,7 Rebasing descendant onto ancestor across | |||
|
222 | 222 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
223 | 223 | |
|
224 | 224 | $ hg tglog |
|
225 |
|
|
|
225 | o 8: 'D' | |
|
226 | 226 | | |
|
227 | 227 | o 7: 'C' |
|
228 | 228 | | |
@@ -238,6 +238,6 Rebasing descendant onto ancestor across | |||
|
238 | 238 | | | |
|
239 | 239 | | o 1: 'E' |
|
240 | 240 | |/ |
|
241 |
|
|
|
241 | @ 0: 'A' | |
|
242 | 242 | |
|
243 | 243 | $ cd .. |
@@ -44,11 +44,11 | |||
|
44 | 44 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) |
|
45 | 45 | |
|
46 | 46 | $ hg tglog |
|
47 |
|
|
|
47 | o 3: 'C' | |
|
48 | 48 | | |
|
49 | 49 | o 2: 'B' |
|
50 | 50 | | |
|
51 |
|
|
|
51 | @ 1: 'AD' | |
|
52 | 52 | | |
|
53 | 53 | o 0: 'A' |
|
54 | 54 |
@@ -126,9 +126,9 set. | |||
|
126 | 126 | grafting revision 3 |
|
127 | 127 | $ hg rebase -s 42ccdea3bb16 -d . |
|
128 | 128 | $ hg log -G |
|
129 |
|
|
|
129 | o 10:5ae4c968c6ac C | |
|
130 | 130 | | |
|
131 |
|
|
|
131 | @ 9:08483444fef9 D | |
|
132 | 132 | | |
|
133 | 133 | o 8:8877864f1edb B |
|
134 | 134 | | |
@@ -143,9 +143,9 set. | |||
|
143 | 143 | o 0:cd010b8cd998 A |
|
144 | 144 | |
|
145 | 145 | $ hg log --hidden -G |
|
146 |
|
|
|
146 | o 10:5ae4c968c6ac C | |
|
147 | 147 | | |
|
148 |
|
|
|
148 | @ 9:08483444fef9 D | |
|
149 | 149 | | |
|
150 | 150 | o 8:8877864f1edb B |
|
151 | 151 | | |
@@ -209,11 +209,11 More complex case were part of the rebas | |||
|
209 | 209 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 {'date': '* *', 'user': 'test'} (glob) |
|
210 | 210 | $ hg log --rev 'divergent()' |
|
211 | 211 | $ hg log -G |
|
212 |
|
|
|
212 | o 13:98f6af4ee953 C | |
|
213 | 213 | | |
|
214 | 214 | o 12:462a34d07e59 B |
|
215 | 215 | | |
|
216 |
|
|
|
216 | @ 11:4596109a6a43 D | |
|
217 | 217 | | |
|
218 | 218 | o 7:02de42196ebe H |
|
219 | 219 | | |
@@ -252,9 +252,9 collapse rebase | |||
|
252 | 252 | $ cd collapse |
|
253 | 253 | $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse |
|
254 | 254 | $ hg log -G |
|
255 |
|
|
|
255 | o 8:4dc2197e807b Collapsed revision | |
|
256 | 256 | | |
|
257 |
| |
|
|
257 | | @ 7:02de42196ebe H | |
|
258 | 258 | | | |
|
259 | 259 | o | 6:eea13746799a G |
|
260 | 260 | |\| |
@@ -265,9 +265,9 collapse rebase | |||
|
265 | 265 | o 0:cd010b8cd998 A |
|
266 | 266 | |
|
267 | 267 | $ hg log --hidden -G |
|
268 |
|
|
|
268 | o 8:4dc2197e807b Collapsed revision | |
|
269 | 269 | | |
|
270 |
| |
|
|
270 | | @ 7:02de42196ebe H | |
|
271 | 271 | | | |
|
272 | 272 | o | 6:eea13746799a G |
|
273 | 273 | |\| |
@@ -305,13 +305,13 not be rebased. | |||
|
305 | 305 | $ hg rebase -s 5fddd98957c8 -d eea13746799a |
|
306 | 306 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe |
|
307 | 307 | $ hg log -G |
|
308 |
|
|
|
308 | o 10:7c6027df6a99 B | |
|
309 | 309 | | |
|
310 | 310 | | o 9:cf44d2f5a9f4 D |
|
311 | 311 | | | |
|
312 | 312 | | o 8:e273c5e7d2d2 C |
|
313 | 313 | | | |
|
314 |
|
|
|
314 | @ | 7:02de42196ebe H | |
|
315 | 315 | | | |
|
316 | 316 | | o 6:eea13746799a G |
|
317 | 317 | |/| |
@@ -322,13 +322,13 not be rebased. | |||
|
322 | 322 | o 0:cd010b8cd998 A |
|
323 | 323 | |
|
324 | 324 | $ hg log --hidden -G |
|
325 |
|
|
|
325 | o 10:7c6027df6a99 B | |
|
326 | 326 | | |
|
327 | 327 | | o 9:cf44d2f5a9f4 D |
|
328 | 328 | | | |
|
329 | 329 | | o 8:e273c5e7d2d2 C |
|
330 | 330 | | | |
|
331 |
|
|
|
331 | @ | 7:02de42196ebe H | |
|
332 | 332 | | | |
|
333 | 333 | | o 6:eea13746799a G |
|
334 | 334 | |/| |
@@ -356,7 +356,7 Test that rewriting leaving instability | |||
|
356 | 356 | 9:cf44d2f5a9f4 D (no-eol) |
|
357 | 357 | $ hg rebase -r 8 |
|
358 | 358 | $ hg log -G |
|
359 |
|
|
|
359 | o 11:0d8f238b634c C | |
|
360 | 360 | | |
|
361 | 361 | o 10:7c6027df6a99 B |
|
362 | 362 | | |
@@ -364,7 +364,7 Test that rewriting leaving instability | |||
|
364 | 364 | | | |
|
365 | 365 | | x 8:e273c5e7d2d2 C |
|
366 | 366 | | | |
|
367 |
|
|
|
367 | @ | 7:02de42196ebe H | |
|
368 | 368 | | | |
|
369 | 369 | | o 6:eea13746799a G |
|
370 | 370 | |/| |
@@ -381,11 +381,11 Test multiple root handling | |||
|
381 | 381 | |
|
382 | 382 | $ hg rebase --dest 4 --rev '7+11+9' |
|
383 | 383 | $ hg log -G |
|
384 |
|
|
|
384 | o 14:1e8370e38cca C | |
|
385 | 385 | | |
|
386 | 386 | | o 13:102b4c1d889b D |
|
387 | 387 | | | |
|
388 |
|
|
|
388 | @ | 12:bfe264faf697 H | |
|
389 | 389 | |/ |
|
390 | 390 | | o 10:7c6027df6a99 B |
|
391 | 391 | | | |
@@ -197,11 +197,11 Specify only source (from 2 onto 8): | |||
|
197 | 197 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
|
198 | 198 | |
|
199 | 199 | $ hg tglog |
|
200 |
|
|
|
200 | o 8: 'D' | |
|
201 | 201 | | |
|
202 | 202 | o 7: 'C' |
|
203 | 203 | | |
|
204 |
|
|
|
204 | @ 6: 'I' | |
|
205 | 205 | | |
|
206 | 206 | o 5: 'H' |
|
207 | 207 | | |
@@ -257,13 +257,13 Specify only base (from 1 onto 8): | |||
|
257 | 257 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
|
258 | 258 | |
|
259 | 259 | $ hg tglog |
|
260 |
|
|
|
260 | o 8: 'D' | |
|
261 | 261 | | |
|
262 | 262 | o 7: 'C' |
|
263 | 263 | | |
|
264 | 264 | o 6: 'B' |
|
265 | 265 | | |
|
266 |
|
|
|
266 | @ 5: 'I' | |
|
267 | 267 | | |
|
268 | 268 | o 4: 'H' |
|
269 | 269 | | |
@@ -287,11 +287,11 Specify source and dest (from 2 onto 7): | |||
|
287 | 287 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) |
|
288 | 288 | |
|
289 | 289 | $ hg tglog |
|
290 |
|
|
|
290 | o 8: 'D' | |
|
291 | 291 | | |
|
292 | 292 | o 7: 'C' |
|
293 | 293 | | |
|
294 |
| |
|
|
294 | | @ 6: 'I' | |
|
295 | 295 | |/ |
|
296 | 296 | o 5: 'H' |
|
297 | 297 | | |
@@ -317,13 +317,13 Specify base and dest (from 1 onto 7): | |||
|
317 | 317 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob) |
|
318 | 318 | |
|
319 | 319 | $ hg tglog |
|
320 |
|
|
|
320 | o 8: 'D' | |
|
321 | 321 | | |
|
322 | 322 | o 7: 'C' |
|
323 | 323 | | |
|
324 | 324 | o 6: 'B' |
|
325 | 325 | | |
|
326 |
| |
|
|
326 | | @ 5: 'I' | |
|
327 | 327 | |/ |
|
328 | 328 | o 4: 'H' |
|
329 | 329 | | |
@@ -347,11 +347,11 Specify only revs (from 2 onto 8) | |||
|
347 | 347 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob) |
|
348 | 348 | |
|
349 | 349 | $ hg tglog |
|
350 |
|
|
|
350 | o 8: 'D' | |
|
351 | 351 | | |
|
352 | 352 | o 7: 'C' |
|
353 | 353 | | |
|
354 |
|
|
|
354 | @ 6: 'I' | |
|
355 | 355 | | |
|
356 | 356 | o 5: 'H' |
|
357 | 357 | | |
@@ -52,9 +52,9 D onto H - simple rebase: | |||
|
52 | 52 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
53 | 53 | |
|
54 | 54 | $ hg tglog |
|
55 |
|
|
|
55 | o 7: 'D' | |
|
56 | 56 | | |
|
57 |
|
|
|
57 | @ 6: 'H' | |
|
58 | 58 | | |
|
59 | 59 | | o 5: 'G' |
|
60 | 60 | |/| |
@@ -80,9 +80,9 D onto F - intermediate point: | |||
|
80 | 80 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
|
81 | 81 | |
|
82 | 82 | $ hg tglog |
|
83 |
|
|
|
83 | o 7: 'D' | |
|
84 | 84 | | |
|
85 |
| |
|
|
85 | | @ 6: 'H' | |
|
86 | 86 | |/ |
|
87 | 87 | | o 5: 'G' |
|
88 | 88 | |/| |
@@ -108,9 +108,9 E onto H - skip of G: | |||
|
108 | 108 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
109 | 109 | |
|
110 | 110 | $ hg tglog |
|
111 |
|
|
|
111 | o 6: 'E' | |
|
112 | 112 | | |
|
113 |
|
|
|
113 | @ 5: 'H' | |
|
114 | 114 | | |
|
115 | 115 | o 4: 'F' |
|
116 | 116 | | |
@@ -160,9 +160,9 G onto H - merged revision having a pare | |||
|
160 | 160 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
|
161 | 161 | |
|
162 | 162 | $ hg tglog |
|
163 |
|
|
|
163 | o 7: 'G' | |
|
164 | 164 | |\ |
|
165 |
| |
|
|
165 | | @ 6: 'H' | |
|
166 | 166 | | | |
|
167 | 167 | | o 5: 'F' |
|
168 | 168 | | | |
@@ -256,11 +256,11 C onto A - rebase onto an ancestor: | |||
|
256 | 256 | $ hg rebase -d 0 -s 2 |
|
257 | 257 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
|
258 | 258 | $ hg tglog |
|
259 |
|
|
|
259 | o 7: 'D' | |
|
260 | 260 | | |
|
261 | 261 | o 6: 'C' |
|
262 | 262 | | |
|
263 |
| |
|
|
263 | | @ 5: 'H' | |
|
264 | 264 | | | |
|
265 | 265 | | | o 4: 'G' |
|
266 | 266 | | |/| |
@@ -360,7 +360,7 Source on have two descendant heads but | |||
|
360 | 360 | [255] |
|
361 | 361 | $ hg rebase -r '2::8' -d 1 --keep |
|
362 | 362 | $ hg tglog |
|
363 |
|
|
|
363 | o 13: 'I' | |
|
364 | 364 | | |
|
365 | 365 | o 12: 'H' |
|
366 | 366 | | |
@@ -401,7 +401,7 Base on have one descendant heads we ask | |||
|
401 | 401 | [255] |
|
402 | 402 | $ hg rebase -r '3::8' -d 1 --keep |
|
403 | 403 | $ hg tglog |
|
404 |
|
|
|
404 | o 12: 'I' | |
|
405 | 405 | | |
|
406 | 406 | o 11: 'H' |
|
407 | 407 | | |
@@ -440,7 +440,7 rebase subset | |||
|
440 | 440 | [255] |
|
441 | 441 | $ hg rebase -r '3::7' -d 1 --keep |
|
442 | 442 | $ hg tglog |
|
443 |
|
|
|
443 | o 11: 'H' | |
|
444 | 444 | | |
|
445 | 445 | o 10: 'G' |
|
446 | 446 | | |
@@ -477,7 +477,7 rebase subset with multiple head | |||
|
477 | 477 | [255] |
|
478 | 478 | $ hg rebase -r '3::(7+5)' -d 1 --keep |
|
479 | 479 | $ hg tglog |
|
480 |
|
|
|
480 | o 13: 'H' | |
|
481 | 481 | | |
|
482 | 482 | o 12: 'G' |
|
483 | 483 | | |
@@ -517,7 +517,7 rebase on ancestor with revset | |||
|
517 | 517 | $ hg rebase -r '6::' -d 2 |
|
518 | 518 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
|
519 | 519 | $ hg tglog |
|
520 |
|
|
|
520 | o 8: 'I' | |
|
521 | 521 | | |
|
522 | 522 | o 7: 'H' |
|
523 | 523 | | |
@@ -547,7 +547,7 We would expect heads are I, F if it was | |||
|
547 | 547 | $ hg rebase -r '(4+6)::' -d 1 |
|
548 | 548 | saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
|
549 | 549 | $ hg tglog |
|
550 |
|
|
|
550 | o 8: 'I' | |
|
551 | 551 | | |
|
552 | 552 | o 7: 'H' |
|
553 | 553 | | |
General Comments 0
You need to be logged in to leave comments.
Login now