equal
deleted
inserted
replaced
26 evolve: 1/3 changesets (33.33%) |
26 evolve: 1/3 changesets (33.33%) |
27 move:[1] second |
27 move:[1] second |
28 atop:[4] first v2 |
28 atop:[4] first v2 |
29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
30 evolve: 1/3 changesets (33.33%) |
30 evolve: 1/3 changesets (33.33%) |
31 searching for copies back to rev 0 |
|
32 resolving manifests |
31 resolving manifests |
33 branchmerge: True, force: True, partial: False |
32 branchmerge: True, force: True, partial: False |
34 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
35 a: remote is newer -> g |
34 a: remote is newer -> g |
36 getting a |
35 getting a |
41 committing changelog |
40 committing changelog |
42 evolve: 2/3 changesets (66.67%) |
41 evolve: 2/3 changesets (66.67%) |
43 move:[2] third |
42 move:[2] third |
44 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
43 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
45 evolve: 2/3 changesets (66.67%) |
44 evolve: 2/3 changesets (66.67%) |
46 searching for copies back to rev 0 |
|
47 unmatched files in other (from base): |
|
48 b |
|
49 unmatched files in other (from topological common ancestor): |
|
50 b |
|
51 resolving manifests |
45 resolving manifests |
52 branchmerge: True, force: True, partial: False |
46 branchmerge: True, force: True, partial: False |
53 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
47 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
54 b: remote created -> g |
48 b: remote created -> g |
55 getting b |
49 getting b |
60 committing changelog |
54 committing changelog |
61 evolve: 3/3 changesets (100.00%) |
55 evolve: 3/3 changesets (100.00%) |
62 move:[3] fourth |
56 move:[3] fourth |
63 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
57 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
64 evolve: 3/3 changesets (100.00%) |
58 evolve: 3/3 changesets (100.00%) |
65 searching for copies back to rev 0 |
|
66 resolving manifests |
59 resolving manifests |
67 branchmerge: True, force: True, partial: False |
60 branchmerge: True, force: True, partial: False |
68 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
61 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
69 b: remote is newer -> g |
62 b: remote is newer -> g |
70 getting b |
63 getting b |
94 evolve: 1/1 changesets (100.00%) |
87 evolve: 1/1 changesets (100.00%) |
95 move:[5] second |
88 move:[5] second |
96 atop:[8] first v3 |
89 atop:[8] first v3 |
97 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
90 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
98 evolve: 1/1 changesets (100.00%) |
91 evolve: 1/1 changesets (100.00%) |
99 searching for copies back to rev 4 |
|
100 resolving manifests |
92 resolving manifests |
101 branchmerge: True, force: True, partial: False |
93 branchmerge: True, force: True, partial: False |
102 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
94 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
103 a: remote is newer -> g |
95 a: remote is newer -> g |
104 getting a |
96 getting a |
125 evolve: 1/3 changesets (33.33%) |
117 evolve: 1/3 changesets (33.33%) |
126 move:[9] second |
118 move:[9] second |
127 atop:[10] first v4 |
119 atop:[10] first v4 |
128 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
120 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
129 evolve: 1/3 changesets (33.33%) |
121 evolve: 1/3 changesets (33.33%) |
130 searching for copies back to rev 8 |
|
131 resolving manifests |
122 resolving manifests |
132 branchmerge: True, force: True, partial: False |
123 branchmerge: True, force: True, partial: False |
133 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
124 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
134 preserving a for resolve of a |
125 preserving a for resolve of a |
135 a: versions differ -> m (premerge) |
126 a: versions differ -> m (premerge) |
159 obscache is out of date |
150 obscache is out of date |
160 move:[6] third |
151 move:[6] third |
161 atop:[11] second |
152 atop:[11] second |
162 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
153 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
163 evolve: 2/3 changesets (66.67%) |
154 evolve: 2/3 changesets (66.67%) |
164 searching for copies back to rev 4 |
|
165 unmatched files in other (from base): |
|
166 b |
|
167 unmatched files in other (from topological common ancestor): |
|
168 b |
|
169 resolving manifests |
155 resolving manifests |
170 branchmerge: True, force: True, partial: False |
156 branchmerge: True, force: True, partial: False |
171 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
157 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
172 b: remote created -> g |
158 b: remote created -> g |
173 getting b |
159 getting b |
177 committing manifest |
163 committing manifest |
178 committing changelog |
164 committing changelog |
179 move:[7] fourth |
165 move:[7] fourth |
180 hg rebase -r 385376d04062 -d b2de95304e32 |
166 hg rebase -r 385376d04062 -d b2de95304e32 |
181 evolve: 3/3 changesets (100.00%) |
167 evolve: 3/3 changesets (100.00%) |
182 searching for copies back to rev 4 |
|
183 resolving manifests |
168 resolving manifests |
184 branchmerge: True, force: True, partial: False |
169 branchmerge: True, force: True, partial: False |
185 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
170 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
186 b: remote is newer -> g |
171 b: remote is newer -> g |
187 getting b |
172 getting b |