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