Show More
@@ -208,7 +208,8 b' def rebase(ui, repo, **opts):' | |||
|
208 | 208 | ui.warn(_("warning: new changesets detected " |
|
209 | 209 | "on source branch, not stripping\n")) |
|
210 | 210 | else: |
|
211 | repair.strip(ui, repo, repo[min(rebased)].node(), "strip") | |
|
211 | # backup the old csets by default | |
|
212 | repair.strip(ui, repo, repo[min(rebased)].node(), "all") | |
|
212 | 213 | |
|
213 | 214 | clearstatus(repo) |
|
214 | 215 | ui.status(_("rebase completed\n")) |
@@ -433,7 +434,8 b' def abort(repo, originalwd, target, stat' | |||
|
433 | 434 | rebased = filter(lambda x: x > -1, state.values()) |
|
434 | 435 | if rebased: |
|
435 | 436 | strippoint = min(rebased) |
|
436 | repair.strip(repo.ui, repo, repo[strippoint].node(), "strip") | |
|
437 | # no backup of rebased cset versions needed | |
|
438 | repair.strip(repo.ui, repo, repo[strippoint].node()) | |
|
437 | 439 | clearstatus(repo) |
|
438 | 440 | repo.ui.status(_('rebase aborted\n')) |
|
439 | 441 |
@@ -9,6 +9,7 b' adding d' | |||
|
9 | 9 | * two 3:2ae46b1d99a7 |
|
10 | 10 | one 1:925d80f479bb |
|
11 | 11 | % rebase |
|
12 | saved backup bundle to | |
|
12 | 13 | adding branch |
|
13 | 14 | adding changesets |
|
14 | 15 | adding manifests |
@@ -18,6 +18,7 b' abort: fix unresolved conflicts with hg ' | |||
|
18 | 18 | merging common |
|
19 | 19 | |
|
20 | 20 | % Abort |
|
21 | saved backup bundle to | |
|
21 | 22 | rebase aborted |
|
22 | 23 | @ 4: L2 |
|
23 | 24 | | |
@@ -32,6 +32,7 b' 2:65a26a4d12f6 B branch: branch1' | |||
|
32 | 32 | 0:1994f17a630e A branch: |
|
33 | 33 | |
|
34 | 34 | % Rebase part of branch2 (5-6) onto branch3 (8) |
|
35 | saved backup bundle to | |
|
35 | 36 | adding branch |
|
36 | 37 | adding changesets |
|
37 | 38 | adding manifests |
@@ -89,6 +90,7 b' o 7:33c9da881988 Branch3 branch: branch' | |||
|
89 | 90 | |/ |
|
90 | 91 | o 0:1994f17a630e A branch: |
|
91 | 92 | |
|
93 | saved backup bundle to | |
|
92 | 94 | adding branch |
|
93 | 95 | adding changesets |
|
94 | 96 | adding manifests |
@@ -147,6 +149,7 b' o 7:33c9da881988 Branch3 branch: branch' | |||
|
147 | 149 | |/ |
|
148 | 150 | o 0:1994f17a630e A branch: |
|
149 | 151 | |
|
152 | saved backup bundle to | |
|
150 | 153 | adding branch |
|
151 | 154 | adding changesets |
|
152 | 155 | adding manifests |
@@ -55,6 +55,7 b' abort: fix unresolved conflicts with hg ' | |||
|
55 | 55 | merging A |
|
56 | 56 | |
|
57 | 57 | % - Solve the conflict and go on |
|
58 | saved backup bundle to | |
|
58 | 59 | adding branch |
|
59 | 60 | adding changesets |
|
60 | 61 | adding manifests |
@@ -16,6 +16,7 b' o 0: A' | |||
|
16 | 16 | |
|
17 | 17 | % Rebasing B onto H |
|
18 | 18 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
19 | saved backup bundle to | |
|
19 | 20 | adding branch |
|
20 | 21 | adding changesets |
|
21 | 22 | adding manifests |
@@ -45,6 +46,7 b' F' | |||
|
45 | 46 | H |
|
46 | 47 | |
|
47 | 48 | % Rebasing G onto H |
|
49 | saved backup bundle to | |
|
48 | 50 | adding branch |
|
49 | 51 | adding changesets |
|
50 | 52 | adding manifests |
@@ -93,6 +95,7 b' o 0: A' | |||
|
93 | 95 | abort: unable to collapse, there is more than one external parent |
|
94 | 96 | |
|
95 | 97 | % Rebase and collapse - E onto H |
|
98 | saved backup bundle to | |
|
96 | 99 | adding branch |
|
97 | 100 | adding changesets |
|
98 | 101 | adding manifests |
@@ -142,6 +145,7 b' o 0: A' | |||
|
142 | 145 | |
|
143 | 146 | % Rebase and collapse - E onto I |
|
144 | 147 | merging E |
|
148 | saved backup bundle to | |
|
145 | 149 | adding branch |
|
146 | 150 | adding changesets |
|
147 | 151 | adding manifests |
@@ -187,6 +191,7 b' o 0: A' | |||
|
187 | 191 | |
|
188 | 192 | |
|
189 | 193 | % Rebase and collapse - B onto F |
|
194 | saved backup bundle to | |
|
190 | 195 | adding branch |
|
191 | 196 | adding changesets |
|
192 | 197 | adding manifests |
@@ -26,6 +26,7 b' abort: fix unresolved conflicts with hg ' | |||
|
26 | 26 | abort: unresolved merge conflicts (see hg resolve) |
|
27 | 27 | |
|
28 | 28 | % Conclude rebase |
|
29 | saved backup bundle to | |
|
29 | 30 | adding branch |
|
30 | 31 | adding changesets |
|
31 | 32 | adding manifests |
@@ -9,6 +9,7 b'' | |||
|
9 | 9 | o 0: A |
|
10 | 10 | |
|
11 | 11 | % Rebasing D onto E detaching from C |
|
12 | saved backup bundle to | |
|
12 | 13 | adding branch |
|
13 | 14 | adding changesets |
|
14 | 15 | adding manifests |
@@ -41,6 +42,7 b' E' | |||
|
41 | 42 | o 0: A |
|
42 | 43 | |
|
43 | 44 | % Rebasing C onto E detaching from B |
|
45 | saved backup bundle to | |
|
44 | 46 | adding branch |
|
45 | 47 | adding changesets |
|
46 | 48 | adding manifests |
@@ -74,6 +76,7 b' E' | |||
|
74 | 76 | o 0: A |
|
75 | 77 | |
|
76 | 78 | % Rebasing B onto E using detach (same as not using it) |
|
79 | saved backup bundle to | |
|
77 | 80 | adding branch |
|
78 | 81 | adding changesets |
|
79 | 82 | adding manifests |
@@ -108,6 +111,7 b' E' | |||
|
108 | 111 | o 0: A |
|
109 | 112 | |
|
110 | 113 | % Rebasing C onto E detaching from B and collapsing |
|
114 | saved backup bundle to | |
|
111 | 115 | adding branch |
|
112 | 116 | adding changesets |
|
113 | 117 | adding manifests |
@@ -13,6 +13,7 b' o 0:c1' | |||
|
13 | 13 | |
|
14 | 14 | % Rebase with no arguments - single revision in source branch |
|
15 | 15 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
16 | saved backup bundle to | |
|
16 | 17 | adding branch |
|
17 | 18 | adding changesets |
|
18 | 19 | adding manifests |
@@ -44,6 +45,7 b' o 0:c1' | |||
|
44 | 45 | |
|
45 | 46 | % Rebase with no arguments - single revision in target branch |
|
46 | 47 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
48 | saved backup bundle to | |
|
47 | 49 | adding branch |
|
48 | 50 | adding changesets |
|
49 | 51 | adding manifests |
@@ -6,6 +6,7 b' applying p1.patch' | |||
|
6 | 6 | |
|
7 | 7 | % Rebase |
|
8 | 8 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
9 | saved backup bundle to | |
|
9 | 10 | adding branch |
|
10 | 11 | adding changesets |
|
11 | 12 | adding manifests |
@@ -27,6 +27,7 b' abort: fix unresolved conflicts with hg ' | |||
|
27 | 27 | merging f |
|
28 | 28 | |
|
29 | 29 | % Fix the 2nd conflict |
|
30 | saved backup bundle to | |
|
30 | 31 | adding branch |
|
31 | 32 | adding changesets |
|
32 | 33 | adding manifests |
@@ -267,6 +267,7 b' nothing to rebase' | |||
|
267 | 267 | |
|
268 | 268 | % Rebase with no arguments (from 3 onto 7) |
|
269 | 269 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
270 | saved backup bundle to | |
|
270 | 271 | adding branch |
|
271 | 272 | adding changesets |
|
272 | 273 | adding manifests |
@@ -278,6 +279,7 b' no rollback information available' | |||
|
278 | 279 | |
|
279 | 280 | % Rebase with base == '.' => same as no arguments (from 3 onto 7) |
|
280 | 281 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
282 | saved backup bundle to | |
|
281 | 283 | adding branch |
|
282 | 284 | adding changesets |
|
283 | 285 | adding manifests |
@@ -287,6 +289,7 b' rebase completed' | |||
|
287 | 289 | |
|
288 | 290 | % Rebase with dest == default => same as no arguments (from 3 onto 7) |
|
289 | 291 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
292 | saved backup bundle to | |
|
290 | 293 | adding branch |
|
291 | 294 | adding changesets |
|
292 | 295 | adding manifests |
@@ -295,6 +298,7 b' added 5 changesets with 5 changes to 5 f' | |||
|
295 | 298 | rebase completed |
|
296 | 299 | |
|
297 | 300 | % Specify only source (from 4 onto 7) |
|
301 | saved backup bundle to | |
|
298 | 302 | adding branch |
|
299 | 303 | adding changesets |
|
300 | 304 | adding manifests |
@@ -304,6 +308,7 b' rebase completed' | |||
|
304 | 308 | |
|
305 | 309 | % Specify only dest (from 3 onto 6) |
|
306 | 310 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
311 | saved backup bundle to | |
|
307 | 312 | adding branch |
|
308 | 313 | adding changesets |
|
309 | 314 | adding manifests |
@@ -312,6 +317,7 b' added 5 changesets with 5 changes to 5 f' | |||
|
312 | 317 | rebase completed |
|
313 | 318 | |
|
314 | 319 | % Specify only base (from 3 onto 7) |
|
320 | saved backup bundle to | |
|
315 | 321 | adding branch |
|
316 | 322 | adding changesets |
|
317 | 323 | adding manifests |
@@ -320,6 +326,7 b' added 5 changesets with 5 changes to 5 f' | |||
|
320 | 326 | rebase completed |
|
321 | 327 | |
|
322 | 328 | % Specify source and dest (from 4 onto 6) |
|
329 | saved backup bundle to | |
|
323 | 330 | adding branch |
|
324 | 331 | adding changesets |
|
325 | 332 | adding manifests |
@@ -328,6 +335,7 b' added 4 changesets with 4 changes to 4 f' | |||
|
328 | 335 | rebase completed |
|
329 | 336 | |
|
330 | 337 | % Specify base and dest (from 3 onto 6) |
|
338 | saved backup bundle to | |
|
331 | 339 | adding branch |
|
332 | 340 | adding changesets |
|
333 | 341 | adding manifests |
@@ -10,6 +10,7 b' adding changesets' | |||
|
10 | 10 | adding manifests |
|
11 | 11 | adding file changes |
|
12 | 12 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
13 | saved backup bundle to | |
|
13 | 14 | adding branch |
|
14 | 15 | adding changesets |
|
15 | 16 | adding manifests |
@@ -12,6 +12,7 b' o 0: A' | |||
|
12 | 12 | |
|
13 | 13 | % Rebasing |
|
14 | 14 | % B onto F - simple rebase |
|
15 | saved backup bundle to | |
|
15 | 16 | adding branch |
|
16 | 17 | adding changesets |
|
17 | 18 | adding manifests |
@@ -31,6 +32,7 b' o | 2: D' | |||
|
31 | 32 | o 0: A |
|
32 | 33 | |
|
33 | 34 | % B onto D - intermediate point |
|
35 | saved backup bundle to | |
|
34 | 36 | adding branch |
|
35 | 37 | adding changesets |
|
36 | 38 | adding manifests |
@@ -50,6 +52,7 b' o | 2: D' | |||
|
50 | 52 | o 0: A |
|
51 | 53 | |
|
52 | 54 | % C onto F - skip of E |
|
55 | saved backup bundle to | |
|
53 | 56 | adding branch |
|
54 | 57 | adding changesets |
|
55 | 58 | adding manifests |
@@ -67,6 +70,7 b' o 2: D' | |||
|
67 | 70 | o 0: A |
|
68 | 71 | |
|
69 | 72 | % D onto C - rebase of a branching point (skip E) |
|
73 | saved backup bundle to | |
|
70 | 74 | adding branch |
|
71 | 75 | adding changesets |
|
72 | 76 | adding manifests |
@@ -84,6 +88,7 b' o 2: C' | |||
|
84 | 88 | o 0: A |
|
85 | 89 | |
|
86 | 90 | % E onto F - merged revision having a parent in ancestors of target |
|
91 | saved backup bundle to | |
|
87 | 92 | adding branch |
|
88 | 93 | adding changesets |
|
89 | 94 | adding manifests |
@@ -103,6 +108,7 b' o | 2: C' | |||
|
103 | 108 | o 0: A |
|
104 | 109 | |
|
105 | 110 | % D onto B - E maintains C as parent |
|
111 | saved backup bundle to | |
|
106 | 112 | adding branch |
|
107 | 113 | adding changesets |
|
108 | 114 | adding manifests |
General Comments 0
You need to be logged in to leave comments.
Login now