equal
deleted
inserted
replaced
154 updating the branch cache |
154 updating the branch cache |
155 obscache is out of date |
155 obscache is out of date |
156 move:[6] third |
156 move:[6] third |
157 atop:[11] second |
157 atop:[11] second |
158 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
158 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
|
159 evolve: 2/3 changesets (66.67%) |
159 unmatched files in other: |
160 unmatched files in other: |
160 b |
161 b |
161 resolving manifests |
162 resolving manifests |
162 branchmerge: True, force: True, partial: False |
163 branchmerge: True, force: True, partial: False |
163 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
164 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
171 updating the branch cache |
172 updating the branch cache |
172 obscache is out of date |
173 obscache is out of date |
173 invalid branchheads cache (served): tip differs |
174 invalid branchheads cache (served): tip differs |
174 move:[7] fourth |
175 move:[7] fourth |
175 hg rebase -r 385376d04062 -d b2de95304e32 |
176 hg rebase -r 385376d04062 -d b2de95304e32 |
|
177 evolve: 3/3 changesets (100.00%) |
176 resolving manifests |
178 resolving manifests |
177 branchmerge: True, force: True, partial: False |
179 branchmerge: True, force: True, partial: False |
178 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
180 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
179 b: remote is newer -> g |
181 b: remote is newer -> g |
180 getting b |
182 getting b |