Mercurial > hg
comparison tests/test-rebase-interruptions.out @ 6906:808f03f61ebe
Add rebase extension
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Mon, 18 Aug 2008 21:16:31 +0200 |
parents | |
children | b345b1cc124f |
comparison
equal
deleted
inserted
replaced
6905:248e54a9456e | 6906:808f03f61ebe |
---|---|
1 % Changes during an interruption - continue | |
2 @ 4: E | |
3 | | |
4 o 3: D | |
5 | | |
6 | o 2: C | |
7 | | | |
8 | o 1: B | |
9 |/ | |
10 o 0: A | |
11 | |
12 | |
13 % - Rebasing B onto E | |
14 merging A | |
15 warning: conflicts during merge. | |
16 merging A failed! | |
17 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
18 | |
19 % - Force a commit on C during the interruption | |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
21 @ 6: Extra | |
22 | | |
23 | o 5: B | |
24 | | | |
25 | o 4: E | |
26 | | | |
27 | o 3: D | |
28 | | | |
29 o | 2: C | |
30 | | | |
31 o | 1: B | |
32 |/ | |
33 o 0: A | |
34 | |
35 | |
36 % - Resume the rebasing | |
37 merging A | |
38 warning: conflicts during merge. | |
39 merging A failed! | |
40 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
41 | |
42 % - Solve the conflict and go on | |
43 warning: new changesets detected on source branch, not stripping | |
44 rebase completed | |
45 @ 7: C | |
46 | | |
47 | o 6: Extra | |
48 | | | |
49 o | 5: B | |
50 | | | |
51 o | 4: E | |
52 | | | |
53 o | 3: D | |
54 | | | |
55 | o 2: C | |
56 | | | |
57 | o 1: B | |
58 |/ | |
59 o 0: A | |
60 | |
61 | |
62 | |
63 % Changes during an interruption - abort | |
64 @ 4: E | |
65 | | |
66 o 3: D | |
67 | | |
68 | o 2: C | |
69 | | | |
70 | o 1: B | |
71 |/ | |
72 o 0: A | |
73 | |
74 | |
75 % Rebasing B onto E | |
76 merging A | |
77 warning: conflicts during merge. | |
78 merging A failed! | |
79 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
80 | |
81 % Force a commit on B' during the interruption | |
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 @ 6: Extra | |
84 | | |
85 o 5: B | |
86 | | |
87 o 4: E | |
88 | | |
89 o 3: D | |
90 | | |
91 | o 2: C | |
92 | | | |
93 | o 1: B | |
94 |/ | |
95 o 0: A | |
96 | |
97 | |
98 % Abort the rebasing | |
99 warning: new changesets detected on target branch, not stripping | |
100 @ 6: Extra | |
101 | | |
102 o 5: B | |
103 | | |
104 o 4: E | |
105 | | |
106 o 3: D | |
107 | | |
108 | o 2: C | |
109 | | | |
110 | o 1: B | |
111 |/ | |
112 o 0: A | |
113 |