Show More
@@ -212,7 +212,7 b' def rebase(ui, repo, **opts):' | |||||
212 | repair.strip(ui, repo, repo[min(rebased)].node(), "all") |
|
212 | repair.strip(ui, repo, repo[min(rebased)].node(), "all") | |
213 |
|
213 | |||
214 | clearstatus(repo) |
|
214 | clearstatus(repo) | |
215 |
ui. |
|
215 | ui.note(_("rebase completed\n")) | |
216 | if os.path.exists(repo.sjoin('undo')): |
|
216 | if os.path.exists(repo.sjoin('undo')): | |
217 | util.unlink(repo.sjoin('undo')) |
|
217 | util.unlink(repo.sjoin('undo')) | |
218 | if skipped: |
|
218 | if skipped: |
@@ -10,7 +10,6 b' adding d' | |||||
10 | one 1:925d80f479bb |
|
10 | one 1:925d80f479bb | |
11 | % rebase |
|
11 | % rebase | |
12 | saved backup bundle to |
|
12 | saved backup bundle to | |
13 | rebase completed |
|
|||
14 | changeset: 3:9163974d1cb5 |
|
13 | changeset: 3:9163974d1cb5 | |
15 | tag: one |
|
14 | tag: one | |
16 | tag: tip |
|
15 | tag: tip |
@@ -33,7 +33,6 b' 0:1994f17a630e A branch:' | |||||
33 |
|
33 | |||
34 | % Rebase part of branch2 (5-6) onto branch3 (8) |
|
34 | % Rebase part of branch2 (5-6) onto branch3 (8) | |
35 | saved backup bundle to |
|
35 | saved backup bundle to | |
36 | rebase completed |
|
|||
37 |
|
36 | |||
38 | % Branches |
|
37 | % Branches | |
39 | branch3 8:c9bfa9beb84e |
|
38 | branch3 8:c9bfa9beb84e | |
@@ -86,7 +85,6 b' o 7:33c9da881988 Branch3 branch: branch' | |||||
86 | o 0:1994f17a630e A branch: |
|
85 | o 0:1994f17a630e A branch: | |
87 |
|
86 | |||
88 | saved backup bundle to |
|
87 | saved backup bundle to | |
89 | rebase completed |
|
|||
90 |
|
88 | |||
91 | % Branches |
|
89 | % Branches | |
92 | branch2 8:b44d3024f247 |
|
90 | branch2 8:b44d3024f247 | |
@@ -140,7 +138,6 b' o 7:33c9da881988 Branch3 branch: branch' | |||||
140 | o 0:1994f17a630e A branch: |
|
138 | o 0:1994f17a630e A branch: | |
141 |
|
139 | |||
142 | saved backup bundle to |
|
140 | saved backup bundle to | |
143 | rebase completed |
|
|||
144 |
|
141 | |||
145 | % Branches |
|
142 | % Branches | |
146 | branch2 7:b44d3024f247 |
|
143 | branch2 7:b44d3024f247 |
@@ -18,7 +18,6 b' abort: fix unresolved conflicts with hg ' | |||||
18 | merging A |
|
18 | merging A | |
19 |
|
19 | |||
20 | % - Solve the conflict and go on |
|
20 | % - Solve the conflict and go on | |
21 | rebase completed |
|
|||
22 | @ 7:C: |
|
21 | @ 7:C: | |
23 | | |
|
22 | | | |
24 | o 6:B: |
|
23 | o 6:B: | |
@@ -56,7 +55,6 b' merging A' | |||||
56 |
|
55 | |||
57 | % - Solve the conflict and go on |
|
56 | % - Solve the conflict and go on | |
58 | saved backup bundle to |
|
57 | saved backup bundle to | |
59 | rebase completed |
|
|||
60 | @ 5:F:notdefault |
|
58 | @ 5:F:notdefault | |
61 | | |
|
59 | | | |
62 | o 4:E: |
|
60 | o 4:E: |
@@ -17,7 +17,6 b' o 0: A' | |||||
17 | % Rebasing B onto H |
|
17 | % Rebasing B onto H | |
18 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
18 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
19 | saved backup bundle to |
|
19 | saved backup bundle to | |
20 | rebase completed |
|
|||
21 | @ 5: Collapsed revision |
|
20 | @ 5: Collapsed revision | |
22 | | * B |
|
21 | | * B | |
23 | | * C |
|
22 | | * C | |
@@ -42,7 +41,6 b' H' | |||||
42 |
|
41 | |||
43 | % Rebasing G onto H |
|
42 | % Rebasing G onto H | |
44 | saved backup bundle to |
|
43 | saved backup bundle to | |
45 | rebase completed |
|
|||
46 | @ 6: Collapsed revision |
|
44 | @ 6: Collapsed revision | |
47 | | * E |
|
45 | | * E | |
48 | | * G |
|
46 | | * G | |
@@ -86,7 +84,6 b' abort: unable to collapse, there is more' | |||||
86 |
|
84 | |||
87 | % Rebase and collapse - E onto H |
|
85 | % Rebase and collapse - E onto H | |
88 | saved backup bundle to |
|
86 | saved backup bundle to | |
89 | rebase completed |
|
|||
90 | @ 5: Collapsed revision |
|
87 | @ 5: Collapsed revision | |
91 | |\ * E |
|
88 | |\ * E | |
92 | | | * F |
|
89 | | | * F | |
@@ -131,7 +128,6 b' o 0: A' | |||||
131 | % Rebase and collapse - E onto I |
|
128 | % Rebase and collapse - E onto I | |
132 | merging E |
|
129 | merging E | |
133 | saved backup bundle to |
|
130 | saved backup bundle to | |
134 | rebase completed |
|
|||
135 | @ 5: Collapsed revision |
|
131 | @ 5: Collapsed revision | |
136 | |\ * E |
|
132 | |\ * E | |
137 | | | * F |
|
133 | | | * F | |
@@ -172,7 +168,6 b' o 0: A' | |||||
172 |
|
168 | |||
173 | % Rebase and collapse - B onto F |
|
169 | % Rebase and collapse - B onto F | |
174 | saved backup bundle to |
|
170 | saved backup bundle to | |
175 | rebase completed |
|
|||
176 | @ 2: Collapsed revision |
|
171 | @ 2: Collapsed revision | |
177 | | * B |
|
172 | | * B | |
178 | | * C |
|
173 | | * C |
@@ -27,7 +27,6 b' abort: unresolved merge conflicts (see h' | |||||
27 |
|
27 | |||
28 | % Conclude rebase |
|
28 | % Conclude rebase | |
29 | saved backup bundle to |
|
29 | saved backup bundle to | |
30 | rebase completed |
|
|||
31 | @ 5: L3 |
|
30 | @ 5: L3 | |
32 | | |
|
31 | | | |
33 | o 4: L2 |
|
32 | o 4: L2 |
@@ -10,7 +10,6 b' o 0: A' | |||||
10 |
|
10 | |||
11 | % Rebasing D onto E detaching from C |
|
11 | % Rebasing D onto E detaching from C | |
12 | saved backup bundle to |
|
12 | saved backup bundle to | |
13 | rebase completed |
|
|||
14 | @ 4: D |
|
13 | @ 4: D | |
15 | | |
|
14 | | | |
16 | o 3: E |
|
15 | o 3: E | |
@@ -38,7 +37,6 b' o 0: A' | |||||
38 |
|
37 | |||
39 | % Rebasing C onto E detaching from B |
|
38 | % Rebasing C onto E detaching from B | |
40 | saved backup bundle to |
|
39 | saved backup bundle to | |
41 | rebase completed |
|
|||
42 | @ 4: D |
|
40 | @ 4: D | |
43 | | |
|
41 | | | |
44 | o 3: C |
|
42 | o 3: C | |
@@ -67,7 +65,6 b' o 0: A' | |||||
67 |
|
65 | |||
68 | % Rebasing B onto E using detach (same as not using it) |
|
66 | % Rebasing B onto E using detach (same as not using it) | |
69 | saved backup bundle to |
|
67 | saved backup bundle to | |
70 | rebase completed |
|
|||
71 | @ 4: D |
|
68 | @ 4: D | |
72 | | |
|
69 | | | |
73 | o 3: C |
|
70 | o 3: C | |
@@ -97,7 +94,6 b' o 0: A' | |||||
97 |
|
94 | |||
98 | % Rebasing C onto E detaching from B and collapsing |
|
95 | % Rebasing C onto E detaching from B and collapsing | |
99 | saved backup bundle to |
|
96 | saved backup bundle to | |
100 | rebase completed |
|
|||
101 | @ 3: Collapsed revision |
|
97 | @ 3: Collapsed revision | |
102 | | * C |
|
98 | | * C | |
103 | | * D |
|
99 | | * D |
@@ -41,7 +41,6 b' abort: fix unresolved conflicts with hg ' | |||||
41 |
|
41 | |||
42 | % - Solve the conflict and go on |
|
42 | % - Solve the conflict and go on | |
43 | warning: new changesets detected on source branch, not stripping |
|
43 | warning: new changesets detected on source branch, not stripping | |
44 | rebase completed |
|
|||
45 | @ 7: C |
|
44 | @ 7: C | |
46 | | |
|
45 | | | |
47 | | o 6: Extra |
|
46 | | o 6: Extra |
@@ -14,7 +14,6 b' o 0:c1' | |||||
14 | % Rebase with no arguments - single revision in source branch |
|
14 | % Rebase with no arguments - single revision in source branch | |
15 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
16 | saved backup bundle to |
|
16 | saved backup bundle to | |
17 | rebase completed |
|
|||
18 | @ 4:l1 |
|
17 | @ 4:l1 | |
19 | | |
|
18 | | | |
20 | o 3:r2 |
|
19 | o 3:r2 | |
@@ -41,7 +40,6 b' o 0:c1' | |||||
41 | % Rebase with no arguments - single revision in target branch |
|
40 | % Rebase with no arguments - single revision in target branch | |
42 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
41 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
43 | saved backup bundle to |
|
42 | saved backup bundle to | |
44 | rebase completed |
|
|||
45 | @ 4:l2 |
|
43 | @ 4:l2 | |
46 | | |
|
44 | | | |
47 | o 3:l1 |
|
45 | o 3:l1 |
@@ -7,7 +7,6 b' applying p1.patch' | |||||
7 | % Rebase |
|
7 | % Rebase | |
8 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
9 | saved backup bundle to |
|
9 | saved backup bundle to | |
10 | rebase completed |
|
|||
11 | @ 3 P0 tags: p0.patch qbase qtip tip |
|
10 | @ 3 P0 tags: p0.patch qbase qtip tip | |
12 | | |
|
11 | | | |
13 | o 2 P1 tags: qparent |
|
12 | o 2 P1 tags: qparent |
@@ -28,7 +28,6 b' merging f' | |||||
28 |
|
28 | |||
29 | % Fix the 2nd conflict |
|
29 | % Fix the 2nd conflict | |
30 | saved backup bundle to |
|
30 | saved backup bundle to | |
31 | rebase completed |
|
|||
32 | @ 3 P1 tags: f2.patch qtip tip |
|
31 | @ 3 P1 tags: f2.patch qtip tip | |
33 | | |
|
32 | | | |
34 | o 2 P0 tags: f.patch qbase |
|
33 | o 2 P0 tags: f.patch qbase |
@@ -268,37 +268,29 b' nothing to rebase' | |||||
268 | % Rebase with no arguments (from 3 onto 7) |
|
268 | % Rebase with no arguments (from 3 onto 7) | |
269 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
269 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
270 | saved backup bundle to |
|
270 | saved backup bundle to | |
271 | rebase completed |
|
|||
272 | % Try to rollback after a rebase (fail) |
|
271 | % Try to rollback after a rebase (fail) | |
273 | no rollback information available |
|
272 | no rollback information available | |
274 |
|
273 | |||
275 | % Rebase with base == '.' => same as no arguments (from 3 onto 7) |
|
274 | % Rebase with base == '.' => same as no arguments (from 3 onto 7) | |
276 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
275 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
277 | saved backup bundle to |
|
276 | saved backup bundle to | |
278 | rebase completed |
|
|||
279 |
|
277 | |||
280 | % Rebase with dest == default => same as no arguments (from 3 onto 7) |
|
278 | % Rebase with dest == default => same as no arguments (from 3 onto 7) | |
281 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
279 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
282 | saved backup bundle to |
|
280 | saved backup bundle to | |
283 | rebase completed |
|
|||
284 |
|
281 | |||
285 | % Specify only source (from 4 onto 7) |
|
282 | % Specify only source (from 4 onto 7) | |
286 | saved backup bundle to |
|
283 | saved backup bundle to | |
287 | rebase completed |
|
|||
288 |
|
284 | |||
289 | % Specify only dest (from 3 onto 6) |
|
285 | % Specify only dest (from 3 onto 6) | |
290 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
286 | 3 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
291 | saved backup bundle to |
|
287 | saved backup bundle to | |
292 | rebase completed |
|
|||
293 |
|
288 | |||
294 | % Specify only base (from 3 onto 7) |
|
289 | % Specify only base (from 3 onto 7) | |
295 | saved backup bundle to |
|
290 | saved backup bundle to | |
296 | rebase completed |
|
|||
297 |
|
291 | |||
298 | % Specify source and dest (from 4 onto 6) |
|
292 | % Specify source and dest (from 4 onto 6) | |
299 | saved backup bundle to |
|
293 | saved backup bundle to | |
300 | rebase completed |
|
|||
301 |
|
294 | |||
302 | % Specify base and dest (from 3 onto 6) |
|
295 | % Specify base and dest (from 3 onto 6) | |
303 | saved backup bundle to |
|
296 | saved backup bundle to | |
304 | rebase completed |
|
@@ -11,7 +11,6 b' adding manifests' | |||||
11 | adding file changes |
|
11 | adding file changes | |
12 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
12 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
13 | saved backup bundle to |
|
13 | saved backup bundle to | |
14 | rebase completed |
|
|||
15 | @ 3:L1 |
|
14 | @ 3:L1 | |
16 | | |
|
15 | | | |
17 | o 2:R1 |
|
16 | o 2:R1 |
@@ -13,7 +13,6 b' o 0: A' | |||||
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 | |
@@ -28,7 +27,6 b' 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 | |
@@ -43,7 +41,6 b' 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 | |
@@ -56,7 +53,6 b' 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 | |
@@ -69,7 +65,6 b' 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 | |
@@ -84,7 +79,6 b' 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 |
General Comments 0
You need to be logged in to leave comments.
Login now