Mercurial > hg
comparison tests/test-rename-merge2.t @ 21391:cb15835456cb
merge: change debug logging - test output changes but no real changes
Preparing for action list split-up, making sure the final change don't have any
test changes.
The patch moves debug statements around without really changing anything.
Arguably, it temporarily makes the code worse. The only justification is that
it makes it easier to review the test changes ... and in the end the big change
will not change test output at all.
The changes to test output are due to changes in the ordering of debug output.
That is mainly because we now do the debug logging for files when we actually
process them. Files are also processed in a slightly different but still
correct order. It is now primarily ordered by action type, secondarily by
filename.
The patch introduces some redundancy. Some of it will be removed again, some of
it will in the end help code readability and efficiency. It is possible that we
later on could introduce a "process this action list and do some logging and
progress reporting and apply this function".
The "preserving X for resolve" debug statements will only have single space
indentation. It will no longer have a leading single space indented "f: msg ->
m" message. Having this message double indented would thus no longer make
sense.
The bid actions will temporarily be sorted using a custom sort key that happens
to match the sort order the simplified code will have in the end.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 22 Apr 2014 02:10:25 +0200 |
| parents | e741972017d9 |
| children | 6a254a2dd37c |
comparison
equal
deleted
inserted
replaced
| 21390:26b84128c54d | 21391:cb15835456cb |
|---|---|
| 84 src: 'a' -> dst: 'b' * | 84 src: 'a' -> dst: 'b' * |
| 85 checking for directory renames | 85 checking for directory renames |
| 86 resolving manifests | 86 resolving manifests |
| 87 branchmerge: True, force: False, partial: False | 87 branchmerge: True, force: False, partial: False |
| 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 89 preserving a for resolve of b | |
| 90 preserving rev for resolve of rev | |
| 89 a: keep -> k | 91 a: keep -> k |
| 90 b: remote copied from a -> m | 92 b: remote copied from a -> m |
| 91 preserving a for resolve of b | |
| 92 rev: versions differ -> m | |
| 93 preserving rev for resolve of rev | |
| 94 updating: b 1/2 files (50.00%) | 93 updating: b 1/2 files (50.00%) |
| 95 picked tool 'python ../merge' for b (binary False symlink False) | 94 picked tool 'python ../merge' for b (binary False symlink False) |
| 96 merging a and b to b | 95 merging a and b to b |
| 97 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 98 premerge successful | 97 premerge successful |
| 98 rev: versions differ -> m | |
| 99 updating: rev 2/2 files (100.00%) | 99 updating: rev 2/2 files (100.00%) |
| 100 picked tool 'python ../merge' for rev (binary False symlink False) | 100 picked tool 'python ../merge' for rev (binary False symlink False) |
| 101 merging rev | 101 merging rev |
| 102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 103 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 103 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 120 src: 'a' -> dst: 'b' * | 120 src: 'a' -> dst: 'b' * |
| 121 checking for directory renames | 121 checking for directory renames |
| 122 resolving manifests | 122 resolving manifests |
| 123 branchmerge: True, force: False, partial: False | 123 branchmerge: True, force: False, partial: False |
| 124 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 | 124 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
| 125 preserving b for resolve of b | |
| 126 preserving rev for resolve of rev | |
| 125 a: remote is newer -> g | 127 a: remote is newer -> g |
| 126 b: local copied/moved from a -> m | |
| 127 preserving b for resolve of b | |
| 128 rev: versions differ -> m | |
| 129 preserving rev for resolve of rev | |
| 130 getting a | 128 getting a |
| 131 updating: a 1/3 files (33.33%) | 129 updating: a 1/3 files (33.33%) |
| 130 b: local copied/moved from a -> m | |
| 132 updating: b 2/3 files (66.67%) | 131 updating: b 2/3 files (66.67%) |
| 133 picked tool 'python ../merge' for b (binary False symlink False) | 132 picked tool 'python ../merge' for b (binary False symlink False) |
| 134 merging b and a to b | 133 merging b and a to b |
| 135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | 134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 136 premerge successful | 135 premerge successful |
| 136 rev: versions differ -> m | |
| 137 updating: rev 3/3 files (100.00%) | 137 updating: rev 3/3 files (100.00%) |
| 138 picked tool 'python ../merge' for rev (binary False symlink False) | 138 picked tool 'python ../merge' for rev (binary False symlink False) |
| 139 merging rev | 139 merging rev |
| 140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 141 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 141 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 158 src: 'a' -> dst: 'b' * | 158 src: 'a' -> dst: 'b' * |
| 159 checking for directory renames | 159 checking for directory renames |
| 160 resolving manifests | 160 resolving manifests |
| 161 branchmerge: True, force: False, partial: False | 161 branchmerge: True, force: False, partial: False |
| 162 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a | 162 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
| 163 preserving a for resolve of b | |
| 164 preserving rev for resolve of rev | |
| 165 removing a | |
| 163 b: remote moved from a -> m | 166 b: remote moved from a -> m |
| 164 preserving a for resolve of b | |
| 165 rev: versions differ -> m | |
| 166 preserving rev for resolve of rev | |
| 167 removing a | |
| 168 updating: b 1/2 files (50.00%) | 167 updating: b 1/2 files (50.00%) |
| 169 picked tool 'python ../merge' for b (binary False symlink False) | 168 picked tool 'python ../merge' for b (binary False symlink False) |
| 170 merging a and b to b | 169 merging a and b to b |
| 171 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | 170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
| 172 premerge successful | 171 premerge successful |
| 172 rev: versions differ -> m | |
| 173 updating: rev 2/2 files (100.00%) | 173 updating: rev 2/2 files (100.00%) |
| 174 picked tool 'python ../merge' for rev (binary False symlink False) | 174 picked tool 'python ../merge' for rev (binary False symlink False) |
| 175 merging rev | 175 merging rev |
| 176 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | 176 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 177 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 177 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 193 src: 'a' -> dst: 'b' * | 193 src: 'a' -> dst: 'b' * |
| 194 checking for directory renames | 194 checking for directory renames |
| 195 resolving manifests | 195 resolving manifests |
| 196 branchmerge: True, force: False, partial: False | 196 branchmerge: True, force: False, partial: False |
| 197 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | 197 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
| 198 preserving b for resolve of b | |
| 199 preserving rev for resolve of rev | |
| 198 b: local copied/moved from a -> m | 200 b: local copied/moved from a -> m |
| 199 preserving b for resolve of b | |
| 200 rev: versions differ -> m | |
| 201 preserving rev for resolve of rev | |
| 202 updating: b 1/2 files (50.00%) | 201 updating: b 1/2 files (50.00%) |
| 203 picked tool 'python ../merge' for b (binary False symlink False) | 202 picked tool 'python ../merge' for b (binary False symlink False) |
| 204 merging b and a to b | 203 merging b and a to b |
| 205 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | 204 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 206 premerge successful | 205 premerge successful |
| 206 rev: versions differ -> m | |
| 207 updating: rev 2/2 files (100.00%) | 207 updating: rev 2/2 files (100.00%) |
| 208 picked tool 'python ../merge' for rev (binary False symlink False) | 208 picked tool 'python ../merge' for rev (binary False symlink False) |
| 209 merging rev | 209 merging rev |
| 210 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 210 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 211 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 211 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 227 src: 'a' -> dst: 'b' | 227 src: 'a' -> dst: 'b' |
| 228 checking for directory renames | 228 checking for directory renames |
| 229 resolving manifests | 229 resolving manifests |
| 230 branchmerge: True, force: False, partial: False | 230 branchmerge: True, force: False, partial: False |
| 231 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 | 231 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
| 232 preserving rev for resolve of rev | |
| 232 b: remote created -> g | 233 b: remote created -> g |
| 233 rev: versions differ -> m | |
| 234 preserving rev for resolve of rev | |
| 235 getting b | 234 getting b |
| 236 updating: b 1/2 files (50.00%) | 235 updating: b 1/2 files (50.00%) |
| 236 rev: versions differ -> m | |
| 237 updating: rev 2/2 files (100.00%) | 237 updating: rev 2/2 files (100.00%) |
| 238 picked tool 'python ../merge' for rev (binary False symlink False) | 238 picked tool 'python ../merge' for rev (binary False symlink False) |
| 239 merging rev | 239 merging rev |
| 240 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 240 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 241 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 241 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 257 src: 'a' -> dst: 'b' | 257 src: 'a' -> dst: 'b' |
| 258 checking for directory renames | 258 checking for directory renames |
| 259 resolving manifests | 259 resolving manifests |
| 260 branchmerge: True, force: False, partial: False | 260 branchmerge: True, force: False, partial: False |
| 261 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 | 261 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
| 262 rev: versions differ -> m | 262 preserving rev for resolve of rev |
| 263 preserving rev for resolve of rev | 263 rev: versions differ -> m |
| 264 updating: rev 1/1 files (100.00%) | 264 updating: rev 1/1 files (100.00%) |
| 265 picked tool 'python ../merge' for rev (binary False symlink False) | 265 picked tool 'python ../merge' for rev (binary False symlink False) |
| 266 merging rev | 266 merging rev |
| 267 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | 267 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 268 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 268 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 284 src: 'a' -> dst: 'b' | 284 src: 'a' -> dst: 'b' |
| 285 checking for directory renames | 285 checking for directory renames |
| 286 resolving manifests | 286 resolving manifests |
| 287 branchmerge: True, force: False, partial: False | 287 branchmerge: True, force: False, partial: False |
| 288 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a | 288 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a |
| 289 preserving rev for resolve of rev | |
| 289 a: other deleted -> r | 290 a: other deleted -> r |
| 290 b: remote created -> g | |
| 291 rev: versions differ -> m | |
| 292 preserving rev for resolve of rev | |
| 293 removing a | 291 removing a |
| 294 updating: a 1/3 files (33.33%) | 292 updating: a 1/3 files (33.33%) |
| 293 b: remote created -> g | |
| 295 getting b | 294 getting b |
| 296 updating: b 2/3 files (66.67%) | 295 updating: b 2/3 files (66.67%) |
| 296 rev: versions differ -> m | |
| 297 updating: rev 3/3 files (100.00%) | 297 updating: rev 3/3 files (100.00%) |
| 298 picked tool 'python ../merge' for rev (binary False symlink False) | 298 picked tool 'python ../merge' for rev (binary False symlink False) |
| 299 merging rev | 299 merging rev |
| 300 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | 300 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 301 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | 301 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
| 316 src: 'a' -> dst: 'b' | 316 src: 'a' -> dst: 'b' |
| 317 checking for directory renames | 317 checking for directory renames |
| 318 resolving manifests | 318 resolving manifests |
| 319 branchmerge: True, force: False, partial: False | 319 branchmerge: True, force: False, partial: False |
| 320 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 | 320 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
| 321 rev: versions differ -> m | 321 preserving rev for resolve of rev |
| 322 preserving rev for resolve of rev | 322 rev: versions differ -> m |
| 323 updating: rev 1/1 files (100.00%) | 323 updating: rev 1/1 files (100.00%) |
| 324 picked tool 'python ../merge' for rev (binary False symlink False) | 324 picked tool 'python ../merge' for rev (binary False symlink False) |
| 325 merging rev | 325 merging rev |
| 326 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | 326 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 339 unmatched files new in both: | 339 unmatched files new in both: |
| 340 b | 340 b |
| 341 resolving manifests | 341 resolving manifests |
| 342 branchmerge: True, force: False, partial: False | 342 branchmerge: True, force: False, partial: False |
| 343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | 343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
| 344 preserving b for resolve of b | |
| 345 preserving rev for resolve of rev | |
| 344 b: versions differ -> m | 346 b: versions differ -> m |
| 345 preserving b for resolve of b | |
| 346 rev: versions differ -> m | |
| 347 preserving rev for resolve of rev | |
| 348 updating: b 1/2 files (50.00%) | 347 updating: b 1/2 files (50.00%) |
| 349 picked tool 'python ../merge' for b (binary False symlink False) | 348 picked tool 'python ../merge' for b (binary False symlink False) |
| 350 merging b | 349 merging b |
| 351 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
| 351 rev: versions differ -> m | |
| 352 updating: rev 2/2 files (100.00%) | 352 updating: rev 2/2 files (100.00%) |
| 353 picked tool 'python ../merge' for rev (binary False symlink False) | 353 picked tool 'python ../merge' for rev (binary False symlink False) |
| 354 merging rev | 354 merging rev |
| 355 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | 355 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 356 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 356 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 377 src: 'a' -> dst: 'c' ! | 377 src: 'a' -> dst: 'c' ! |
| 378 checking for directory renames | 378 checking for directory renames |
| 379 resolving manifests | 379 resolving manifests |
| 380 branchmerge: True, force: False, partial: False | 380 branchmerge: True, force: False, partial: False |
| 381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e | 381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
| 382 preserving rev for resolve of rev | |
| 382 c: remote created -> g | 383 c: remote created -> g |
| 383 rev: versions differ -> m | |
| 384 preserving rev for resolve of rev | |
| 385 a: divergent renames -> dr | |
| 386 getting c | 384 getting c |
| 387 updating: c 1/3 files (33.33%) | 385 updating: c 1/3 files (33.33%) |
| 386 rev: versions differ -> m | |
| 388 updating: rev 2/3 files (66.67%) | 387 updating: rev 2/3 files (66.67%) |
| 389 picked tool 'python ../merge' for rev (binary False symlink False) | 388 picked tool 'python ../merge' for rev (binary False symlink False) |
| 390 merging rev | 389 merging rev |
| 391 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
| 391 a: divergent renames -> dr | |
| 392 updating: a 3/3 files (100.00%) | 392 updating: a 3/3 files (100.00%) |
| 393 note: possible conflict - a was renamed multiple times to: | 393 note: possible conflict - a was renamed multiple times to: |
| 394 b | 394 b |
| 395 c | 395 c |
| 396 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 396 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 409 unmatched files new in both: | 409 unmatched files new in both: |
| 410 b | 410 b |
| 411 resolving manifests | 411 resolving manifests |
| 412 branchmerge: True, force: False, partial: False | 412 branchmerge: True, force: False, partial: False |
| 413 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | 413 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
| 414 preserving b for resolve of b | |
| 415 preserving rev for resolve of rev | |
| 414 b: versions differ -> m | 416 b: versions differ -> m |
| 415 preserving b for resolve of b | |
| 416 rev: versions differ -> m | |
| 417 preserving rev for resolve of rev | |
| 418 updating: b 1/2 files (50.00%) | 417 updating: b 1/2 files (50.00%) |
| 419 picked tool 'python ../merge' for b (binary False symlink False) | 418 picked tool 'python ../merge' for b (binary False symlink False) |
| 420 merging b | 419 merging b |
| 421 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | 420 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
| 421 rev: versions differ -> m | |
| 422 updating: rev 2/2 files (100.00%) | 422 updating: rev 2/2 files (100.00%) |
| 423 picked tool 'python ../merge' for rev (binary False symlink False) | 423 picked tool 'python ../merge' for rev (binary False symlink False) |
| 424 merging rev | 424 merging rev |
| 425 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | 425 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
| 426 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 426 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 439 unmatched files new in both: | 439 unmatched files new in both: |
| 440 b | 440 b |
| 441 resolving manifests | 441 resolving manifests |
| 442 branchmerge: True, force: False, partial: False | 442 branchmerge: True, force: False, partial: False |
| 443 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 443 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 444 preserving b for resolve of b | |
| 445 preserving rev for resolve of rev | |
| 444 a: other deleted -> r | 446 a: other deleted -> r |
| 445 b: versions differ -> m | |
| 446 preserving b for resolve of b | |
| 447 rev: versions differ -> m | |
| 448 preserving rev for resolve of rev | |
| 449 removing a | 447 removing a |
| 450 updating: a 1/3 files (33.33%) | 448 updating: a 1/3 files (33.33%) |
| 449 b: versions differ -> m | |
| 451 updating: b 2/3 files (66.67%) | 450 updating: b 2/3 files (66.67%) |
| 452 picked tool 'python ../merge' for b (binary False symlink False) | 451 picked tool 'python ../merge' for b (binary False symlink False) |
| 453 merging b | 452 merging b |
| 454 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 453 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 454 rev: versions differ -> m | |
| 455 updating: rev 3/3 files (100.00%) | 455 updating: rev 3/3 files (100.00%) |
| 456 picked tool 'python ../merge' for rev (binary False symlink False) | 456 picked tool 'python ../merge' for rev (binary False symlink False) |
| 457 merging rev | 457 merging rev |
| 458 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 458 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 459 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 459 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 471 unmatched files new in both: | 471 unmatched files new in both: |
| 472 b | 472 b |
| 473 resolving manifests | 473 resolving manifests |
| 474 branchmerge: True, force: False, partial: False | 474 branchmerge: True, force: False, partial: False |
| 475 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | 475 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
| 476 preserving b for resolve of b | |
| 477 preserving rev for resolve of rev | |
| 476 a: remote is newer -> g | 478 a: remote is newer -> g |
| 477 b: versions differ -> m | |
| 478 preserving b for resolve of b | |
| 479 rev: versions differ -> m | |
| 480 preserving rev for resolve of rev | |
| 481 getting a | 479 getting a |
| 482 updating: a 1/3 files (33.33%) | 480 updating: a 1/3 files (33.33%) |
| 481 b: versions differ -> m | |
| 483 updating: b 2/3 files (66.67%) | 482 updating: b 2/3 files (66.67%) |
| 484 picked tool 'python ../merge' for b (binary False symlink False) | 483 picked tool 'python ../merge' for b (binary False symlink False) |
| 485 merging b | 484 merging b |
| 486 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 485 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 486 rev: versions differ -> m | |
| 487 updating: rev 3/3 files (100.00%) | 487 updating: rev 3/3 files (100.00%) |
| 488 picked tool 'python ../merge' for rev (binary False symlink False) | 488 picked tool 'python ../merge' for rev (binary False symlink False) |
| 489 merging rev | 489 merging rev |
| 490 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 490 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 491 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 491 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 504 unmatched files new in both: | 504 unmatched files new in both: |
| 505 b | 505 b |
| 506 resolving manifests | 506 resolving manifests |
| 507 branchmerge: True, force: False, partial: False | 507 branchmerge: True, force: False, partial: False |
| 508 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | 508 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
| 509 preserving b for resolve of b | |
| 510 preserving rev for resolve of rev | |
| 509 a: other deleted -> r | 511 a: other deleted -> r |
| 510 b: versions differ -> m | |
| 511 preserving b for resolve of b | |
| 512 rev: versions differ -> m | |
| 513 preserving rev for resolve of rev | |
| 514 removing a | 512 removing a |
| 515 updating: a 1/3 files (33.33%) | 513 updating: a 1/3 files (33.33%) |
| 514 b: versions differ -> m | |
| 516 updating: b 2/3 files (66.67%) | 515 updating: b 2/3 files (66.67%) |
| 517 picked tool 'python ../merge' for b (binary False symlink False) | 516 picked tool 'python ../merge' for b (binary False symlink False) |
| 518 merging b | 517 merging b |
| 519 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 518 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 519 rev: versions differ -> m | |
| 520 updating: rev 3/3 files (100.00%) | 520 updating: rev 3/3 files (100.00%) |
| 521 picked tool 'python ../merge' for rev (binary False symlink False) | 521 picked tool 'python ../merge' for rev (binary False symlink False) |
| 522 merging rev | 522 merging rev |
| 523 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 523 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 524 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 524 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 536 unmatched files new in both: | 536 unmatched files new in both: |
| 537 b | 537 b |
| 538 resolving manifests | 538 resolving manifests |
| 539 branchmerge: True, force: False, partial: False | 539 branchmerge: True, force: False, partial: False |
| 540 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | 540 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
| 541 preserving b for resolve of b | |
| 542 preserving rev for resolve of rev | |
| 541 a: remote is newer -> g | 543 a: remote is newer -> g |
| 542 b: versions differ -> m | |
| 543 preserving b for resolve of b | |
| 544 rev: versions differ -> m | |
| 545 preserving rev for resolve of rev | |
| 546 getting a | 544 getting a |
| 547 updating: a 1/3 files (33.33%) | 545 updating: a 1/3 files (33.33%) |
| 546 b: versions differ -> m | |
| 548 updating: b 2/3 files (66.67%) | 547 updating: b 2/3 files (66.67%) |
| 549 picked tool 'python ../merge' for b (binary False symlink False) | 548 picked tool 'python ../merge' for b (binary False symlink False) |
| 550 merging b | 549 merging b |
| 551 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 550 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 551 rev: versions differ -> m | |
| 552 updating: rev 3/3 files (100.00%) | 552 updating: rev 3/3 files (100.00%) |
| 553 picked tool 'python ../merge' for rev (binary False symlink False) | 553 picked tool 'python ../merge' for rev (binary False symlink False) |
| 554 merging rev | 554 merging rev |
| 555 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 555 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 556 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 556 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 569 unmatched files new in both: | 569 unmatched files new in both: |
| 570 b | 570 b |
| 571 resolving manifests | 571 resolving manifests |
| 572 branchmerge: True, force: False, partial: False | 572 branchmerge: True, force: False, partial: False |
| 573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | 573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
| 574 preserving b for resolve of b | |
| 575 preserving rev for resolve of rev | |
| 574 a: keep -> k | 576 a: keep -> k |
| 575 b: versions differ -> m | 577 b: versions differ -> m |
| 576 preserving b for resolve of b | |
| 577 rev: versions differ -> m | |
| 578 preserving rev for resolve of rev | |
| 579 updating: b 1/2 files (50.00%) | 578 updating: b 1/2 files (50.00%) |
| 580 picked tool 'python ../merge' for b (binary False symlink False) | 579 picked tool 'python ../merge' for b (binary False symlink False) |
| 581 merging b | 580 merging b |
| 582 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | 581 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
| 582 rev: versions differ -> m | |
| 583 updating: rev 2/2 files (100.00%) | 583 updating: rev 2/2 files (100.00%) |
| 584 picked tool 'python ../merge' for rev (binary False symlink False) | 584 picked tool 'python ../merge' for rev (binary False symlink False) |
| 585 merging rev | 585 merging rev |
| 586 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 586 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 587 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 587 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 602 resolving manifests | 602 resolving manifests |
| 603 branchmerge: True, force: False, partial: False | 603 branchmerge: True, force: False, partial: False |
| 604 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a | 604 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
| 605 remote changed a which local deleted | 605 remote changed a which local deleted |
| 606 use (c)hanged version or leave (d)eleted? c | 606 use (c)hanged version or leave (d)eleted? c |
| 607 preserving b for resolve of b | |
| 608 preserving rev for resolve of rev | |
| 607 a: prompt recreating -> g | 609 a: prompt recreating -> g |
| 608 b: versions differ -> m | |
| 609 preserving b for resolve of b | |
| 610 rev: versions differ -> m | |
| 611 preserving rev for resolve of rev | |
| 612 getting a | 610 getting a |
| 613 updating: a 1/3 files (33.33%) | 611 updating: a 1/3 files (33.33%) |
| 612 b: versions differ -> m | |
| 614 updating: b 2/3 files (66.67%) | 613 updating: b 2/3 files (66.67%) |
| 615 picked tool 'python ../merge' for b (binary False symlink False) | 614 picked tool 'python ../merge' for b (binary False symlink False) |
| 616 merging b | 615 merging b |
| 617 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 616 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
| 617 rev: versions differ -> m | |
| 618 updating: rev 3/3 files (100.00%) | 618 updating: rev 3/3 files (100.00%) |
| 619 picked tool 'python ../merge' for rev (binary False symlink False) | 619 picked tool 'python ../merge' for rev (binary False symlink False) |
| 620 merging rev | 620 merging rev |
| 621 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | 621 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 622 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 622 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 637 resolving manifests | 637 resolving manifests |
| 638 branchmerge: True, force: False, partial: False | 638 branchmerge: True, force: False, partial: False |
| 639 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | 639 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
| 640 local changed a which remote deleted | 640 local changed a which remote deleted |
| 641 use (c)hanged version or (d)elete? c | 641 use (c)hanged version or (d)elete? c |
| 642 preserving b for resolve of b | |
| 643 preserving rev for resolve of rev | |
| 642 a: prompt keep -> a | 644 a: prompt keep -> a |
| 645 updating: a 1/3 files (33.33%) | |
| 643 b: versions differ -> m | 646 b: versions differ -> m |
| 644 preserving b for resolve of b | |
| 645 rev: versions differ -> m | |
| 646 preserving rev for resolve of rev | |
| 647 updating: a 1/3 files (33.33%) | |
| 648 updating: b 2/3 files (66.67%) | 647 updating: b 2/3 files (66.67%) |
| 649 picked tool 'python ../merge' for b (binary False symlink False) | 648 picked tool 'python ../merge' for b (binary False symlink False) |
| 650 merging b | 649 merging b |
| 651 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 650 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
| 651 rev: versions differ -> m | |
| 652 updating: rev 3/3 files (100.00%) | 652 updating: rev 3/3 files (100.00%) |
| 653 picked tool 'python ../merge' for rev (binary False symlink False) | 653 picked tool 'python ../merge' for rev (binary False symlink False) |
| 654 merging rev | 654 merging rev |
| 655 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | 655 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 656 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 656 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 672 src: 'a' -> dst: 'b' * | 672 src: 'a' -> dst: 'b' * |
| 673 checking for directory renames | 673 checking for directory renames |
| 674 resolving manifests | 674 resolving manifests |
| 675 branchmerge: True, force: False, partial: False | 675 branchmerge: True, force: False, partial: False |
| 676 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 | 676 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
| 677 preserving a for resolve of b | |
| 678 preserving rev for resolve of rev | |
| 679 removing a | |
| 677 b: remote moved from a -> m | 680 b: remote moved from a -> m |
| 678 preserving a for resolve of b | |
| 679 rev: versions differ -> m | |
| 680 preserving rev for resolve of rev | |
| 681 removing a | |
| 682 updating: b 1/2 files (50.00%) | 681 updating: b 1/2 files (50.00%) |
| 683 picked tool 'python ../merge' for b (binary False symlink False) | 682 picked tool 'python ../merge' for b (binary False symlink False) |
| 684 merging a and b to b | 683 merging a and b to b |
| 685 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 684 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
| 685 rev: versions differ -> m | |
| 686 updating: rev 2/2 files (100.00%) | 686 updating: rev 2/2 files (100.00%) |
| 687 picked tool 'python ../merge' for rev (binary False symlink False) | 687 picked tool 'python ../merge' for rev (binary False symlink False) |
| 688 merging rev | 688 merging rev |
| 689 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | 689 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 690 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 690 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 706 src: 'a' -> dst: 'b' * | 706 src: 'a' -> dst: 'b' * |
| 707 checking for directory renames | 707 checking for directory renames |
| 708 resolving manifests | 708 resolving manifests |
| 709 branchmerge: True, force: False, partial: False | 709 branchmerge: True, force: False, partial: False |
| 710 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | 710 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
| 711 preserving b for resolve of b | |
| 712 preserving rev for resolve of rev | |
| 711 b: local copied/moved from a -> m | 713 b: local copied/moved from a -> m |
| 712 preserving b for resolve of b | |
| 713 rev: versions differ -> m | |
| 714 preserving rev for resolve of rev | |
| 715 updating: b 1/2 files (50.00%) | 714 updating: b 1/2 files (50.00%) |
| 716 picked tool 'python ../merge' for b (binary False symlink False) | 715 picked tool 'python ../merge' for b (binary False symlink False) |
| 717 merging b and a to b | 716 merging b and a to b |
| 718 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | 717 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 718 rev: versions differ -> m | |
| 719 updating: rev 2/2 files (100.00%) | 719 updating: rev 2/2 files (100.00%) |
| 720 picked tool 'python ../merge' for rev (binary False symlink False) | 720 picked tool 'python ../merge' for rev (binary False symlink False) |
| 721 merging rev | 721 merging rev |
| 722 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 722 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 723 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 723 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 744 src: 'a' -> dst: 'b' * | 744 src: 'a' -> dst: 'b' * |
| 745 checking for directory renames | 745 checking for directory renames |
| 746 resolving manifests | 746 resolving manifests |
| 747 branchmerge: True, force: False, partial: False | 747 branchmerge: True, force: False, partial: False |
| 748 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f | 748 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
| 749 preserving b for resolve of b | |
| 750 preserving rev for resolve of rev | |
| 749 c: remote created -> g | 751 c: remote created -> g |
| 750 b: local copied/moved from a -> m | |
| 751 preserving b for resolve of b | |
| 752 rev: versions differ -> m | |
| 753 preserving rev for resolve of rev | |
| 754 getting c | 752 getting c |
| 755 updating: c 1/3 files (33.33%) | 753 updating: c 1/3 files (33.33%) |
| 754 b: local copied/moved from a -> m | |
| 756 updating: b 2/3 files (66.67%) | 755 updating: b 2/3 files (66.67%) |
| 757 picked tool 'python ../merge' for b (binary False symlink False) | 756 picked tool 'python ../merge' for b (binary False symlink False) |
| 758 merging b and a to b | 757 merging b and a to b |
| 759 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | 758 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
| 760 premerge successful | 759 premerge successful |
| 760 rev: versions differ -> m | |
| 761 updating: rev 3/3 files (100.00%) | 761 updating: rev 3/3 files (100.00%) |
| 762 picked tool 'python ../merge' for rev (binary False symlink False) | 762 picked tool 'python ../merge' for rev (binary False symlink False) |
| 763 merging rev | 763 merging rev |
| 764 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | 764 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
| 765 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 765 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 834 resolving manifests | 834 resolving manifests |
| 835 branchmerge: True, force: True, partial: False | 835 branchmerge: True, force: True, partial: False |
| 836 ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 | 836 ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 |
| 837 remote changed 8/f which local deleted | 837 remote changed 8/f which local deleted |
| 838 use (c)hanged version or leave (d)eleted? c | 838 use (c)hanged version or leave (d)eleted? c |
| 839 preserving 0/f for resolve of 0/f | |
| 840 preserving 1/g for resolve of 1/g | |
| 841 preserving 2/f for resolve of 2/f | |
| 842 preserving 3/f for resolve of 3/f | |
| 843 preserving 3/f for resolve of 3/g | |
| 844 preserving 4/f for resolve of 4/g | |
| 845 preserving 5/f for resolve of 5/f | |
| 846 preserving 5/g for resolve of 5/g | |
| 847 preserving 6/g for resolve of 6/g | |
| 848 preserving 7/f for resolve of 7/f | |
| 849 removing 4/f | |
| 839 8/f: prompt recreating -> g | 850 8/f: prompt recreating -> g |
| 840 0/f: versions differ -> m | |
| 841 preserving 0/f for resolve of 0/f | |
| 842 1/g: versions differ -> m | |
| 843 preserving 1/g for resolve of 1/g | |
| 844 2/f: versions differ -> m | |
| 845 preserving 2/f for resolve of 2/f | |
| 846 3/f: versions differ -> m | |
| 847 preserving 3/f for resolve of 3/f | |
| 848 3/g: remote copied from 3/f -> m | |
| 849 preserving 3/f for resolve of 3/g | |
| 850 4/g: remote moved from 4/f -> m | |
| 851 preserving 4/f for resolve of 4/g | |
| 852 5/f: versions differ -> m | |
| 853 preserving 5/f for resolve of 5/f | |
| 854 5/g: local copied/moved from 5/f -> m | |
| 855 preserving 5/g for resolve of 5/g | |
| 856 6/g: local copied/moved from 6/f -> m | |
| 857 preserving 6/g for resolve of 6/g | |
| 858 7/f: remote differs from untracked local -> m | |
| 859 preserving 7/f for resolve of 7/f | |
| 860 removing 4/f | |
| 861 getting 8/f | 851 getting 8/f |
| 862 $ hg mani | 852 $ hg mani |
| 863 0/f | 853 0/f |
| 864 1/g | 854 1/g |
| 865 2/f | 855 2/f |