Mercurial > hg
comparison tests/test-rename-merge2.t @ 33286:2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
This time ones that are prefixed with =, ", ', or `. This appears to
be the last of them.
Differential Revision: https://phab.mercurial-scm.org/D14
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 20 Jun 2017 17:31:18 -0400 |
| parents | 4d504e541d3d |
| children | 41ef02ba329b |
comparison
equal
deleted
inserted
replaced
| 33285:98f6c25aaf61 | 33286:2428e8ec0793 |
|---|---|
| 45 > | 45 > |
| 46 > # merge | 46 > # merge |
| 47 > echo "--------------" | 47 > echo "--------------" |
| 48 > echo "test L:$1 R:$2 W:$3 - $4" | 48 > echo "test L:$1 R:$2 W:$3 - $4" |
| 49 > echo "--------------" | 49 > echo "--------------" |
| 50 > hg merge -y --debug --traceback --tool="python ../merge" | 50 > hg merge -y --debug --traceback --tool="$PYTHON ../merge" |
| 51 > | 51 > |
| 52 > echo "--------------" | 52 > echo "--------------" |
| 53 > hg status -camC -X rev | 53 > hg status -camC -X rev |
| 54 > | 54 > |
| 55 > hg ci -m "merge" | 55 > hg ci -m "merge" |
| 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 89 preserving a for resolve of b | 89 preserving a for resolve of b |
| 90 preserving rev for resolve of rev | 90 preserving rev for resolve of rev |
| 91 starting 4 threads for background file closing (?) | 91 starting 4 threads for background file closing (?) |
| 92 b: remote copied from a -> m (premerge) | 92 b: remote copied from a -> m (premerge) |
| 93 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 93 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 94 merging a and b to b | 94 merging a and b to b |
| 95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
| 96 premerge successful | 96 premerge successful |
| 97 rev: versions differ -> m (premerge) | 97 rev: versions differ -> m (premerge) |
| 98 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 98 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 99 merging rev | 99 merging rev |
| 100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 101 rev: versions differ -> m (merge) | 101 rev: versions differ -> m (merge) |
| 102 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 102 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 103 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 103 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 104 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 104 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 105 merge tool returned: 0 | 105 merge tool returned: 0 |
| 106 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 106 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 107 (branch merge, don't forget to commit) | 107 (branch merge, don't forget to commit) |
| 108 -------------- | 108 -------------- |
| 109 M b | 109 M b |
| 128 preserving b for resolve of b | 128 preserving b for resolve of b |
| 129 preserving rev for resolve of rev | 129 preserving rev for resolve of rev |
| 130 a: remote is newer -> g | 130 a: remote is newer -> g |
| 131 getting a | 131 getting a |
| 132 b: local copied/moved from a -> m (premerge) | 132 b: local copied/moved from a -> m (premerge) |
| 133 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 133 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 134 merging b and a to b | 134 merging b and a to b |
| 135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | 135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 136 premerge successful | 136 premerge successful |
| 137 rev: versions differ -> m (premerge) | 137 rev: versions differ -> m (premerge) |
| 138 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 138 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 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 rev: versions differ -> m (merge) | 141 rev: versions differ -> m (merge) |
| 142 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 142 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 143 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 143 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 144 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 144 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 145 merge tool returned: 0 | 145 merge tool returned: 0 |
| 146 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 146 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 147 (branch merge, don't forget to commit) | 147 (branch merge, don't forget to commit) |
| 148 -------------- | 148 -------------- |
| 149 M a | 149 M a |
| 168 preserving a for resolve of b | 168 preserving a for resolve of b |
| 169 preserving rev for resolve of rev | 169 preserving rev for resolve of rev |
| 170 removing a | 170 removing a |
| 171 starting 4 threads for background file closing (?) | 171 starting 4 threads for background file closing (?) |
| 172 b: remote moved from a -> m (premerge) | 172 b: remote moved from a -> m (premerge) |
| 173 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 173 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 174 merging a and b to b | 174 merging a and b to b |
| 175 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | 175 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
| 176 premerge successful | 176 premerge successful |
| 177 rev: versions differ -> m (premerge) | 177 rev: versions differ -> m (premerge) |
| 178 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 178 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 179 merging rev | 179 merging rev |
| 180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | 180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 181 rev: versions differ -> m (merge) | 181 rev: versions differ -> m (merge) |
| 182 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 182 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 183 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | 183 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 184 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 184 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 185 merge tool returned: 0 | 185 merge tool returned: 0 |
| 186 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 186 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 187 (branch merge, don't forget to commit) | 187 (branch merge, don't forget to commit) |
| 188 -------------- | 188 -------------- |
| 189 M b | 189 M b |
| 206 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | 206 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
| 207 preserving b for resolve of b | 207 preserving b for resolve of b |
| 208 preserving rev for resolve of rev | 208 preserving rev for resolve of rev |
| 209 starting 4 threads for background file closing (?) | 209 starting 4 threads for background file closing (?) |
| 210 b: local copied/moved from a -> m (premerge) | 210 b: local copied/moved from a -> m (premerge) |
| 211 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 211 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 212 merging b and a to b | 212 merging b and a to b |
| 213 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | 213 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 214 premerge successful | 214 premerge successful |
| 215 rev: versions differ -> m (premerge) | 215 rev: versions differ -> m (premerge) |
| 216 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 216 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 217 merging rev | 217 merging rev |
| 218 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 218 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 219 rev: versions differ -> m (merge) | 219 rev: versions differ -> m (merge) |
| 220 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 220 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 221 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 221 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 222 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 222 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 223 merge tool returned: 0 | 223 merge tool returned: 0 |
| 224 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 224 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 225 (branch merge, don't forget to commit) | 225 (branch merge, don't forget to commit) |
| 226 -------------- | 226 -------------- |
| 227 M b | 227 M b |
| 244 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 | 244 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
| 245 preserving rev for resolve of rev | 245 preserving rev for resolve of rev |
| 246 b: remote created -> g | 246 b: remote created -> g |
| 247 getting b | 247 getting b |
| 248 rev: versions differ -> m (premerge) | 248 rev: versions differ -> m (premerge) |
| 249 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 249 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 250 merging rev | 250 merging rev |
| 251 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 251 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 252 rev: versions differ -> m (merge) | 252 rev: versions differ -> m (merge) |
| 253 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 253 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 254 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 254 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 255 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 255 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 256 merge tool returned: 0 | 256 merge tool returned: 0 |
| 257 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 257 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 258 (branch merge, don't forget to commit) | 258 (branch merge, don't forget to commit) |
| 259 -------------- | 259 -------------- |
| 260 M b | 260 M b |
| 276 branchmerge: True, force: False, partial: False | 276 branchmerge: True, force: False, partial: False |
| 277 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 | 277 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
| 278 preserving rev for resolve of rev | 278 preserving rev for resolve of rev |
| 279 starting 4 threads for background file closing (?) | 279 starting 4 threads for background file closing (?) |
| 280 rev: versions differ -> m (premerge) | 280 rev: versions differ -> m (premerge) |
| 281 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 281 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 282 merging rev | 282 merging rev |
| 283 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | 283 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 284 rev: versions differ -> m (merge) | 284 rev: versions differ -> m (merge) |
| 285 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 285 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 286 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | 286 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 287 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 287 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 288 merge tool returned: 0 | 288 merge tool returned: 0 |
| 289 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 289 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 290 (branch merge, don't forget to commit) | 290 (branch merge, don't forget to commit) |
| 291 -------------- | 291 -------------- |
| 292 C a | 292 C a |
| 311 a: other deleted -> r | 311 a: other deleted -> r |
| 312 removing a | 312 removing a |
| 313 b: remote created -> g | 313 b: remote created -> g |
| 314 getting b | 314 getting b |
| 315 rev: versions differ -> m (premerge) | 315 rev: versions differ -> m (premerge) |
| 316 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 316 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 317 merging rev | 317 merging rev |
| 318 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | 318 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 319 rev: versions differ -> m (merge) | 319 rev: versions differ -> m (merge) |
| 320 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 320 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 321 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | 321 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 322 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 322 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 323 merge tool returned: 0 | 323 merge tool returned: 0 |
| 324 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | 324 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
| 325 (branch merge, don't forget to commit) | 325 (branch merge, don't forget to commit) |
| 326 -------------- | 326 -------------- |
| 327 M b | 327 M b |
| 342 branchmerge: True, force: False, partial: False | 342 branchmerge: True, force: False, partial: False |
| 343 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 | 343 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
| 344 preserving rev for resolve of rev | 344 preserving rev for resolve of rev |
| 345 starting 4 threads for background file closing (?) | 345 starting 4 threads for background file closing (?) |
| 346 rev: versions differ -> m (premerge) | 346 rev: versions differ -> m (premerge) |
| 347 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 347 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 348 merging rev | 348 merging rev |
| 349 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | 349 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 350 rev: versions differ -> m (merge) | 350 rev: versions differ -> m (merge) |
| 351 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 351 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 352 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | 352 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
| 353 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 353 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 354 merge tool returned: 0 | 354 merge tool returned: 0 |
| 355 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 355 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 356 (branch merge, don't forget to commit) | 356 (branch merge, don't forget to commit) |
| 357 -------------- | 357 -------------- |
| 358 C b | 358 C b |
| 371 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | 371 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
| 372 preserving b for resolve of b | 372 preserving b for resolve of b |
| 373 preserving rev for resolve of rev | 373 preserving rev for resolve of rev |
| 374 starting 4 threads for background file closing (?) | 374 starting 4 threads for background file closing (?) |
| 375 b: both renamed from a -> m (premerge) | 375 b: both renamed from a -> m (premerge) |
| 376 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 376 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 377 merging b | 377 merging b |
| 378 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 378 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
| 379 rev: versions differ -> m (premerge) | 379 rev: versions differ -> m (premerge) |
| 380 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 380 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 381 merging rev | 381 merging rev |
| 382 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | 382 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 383 b: both renamed from a -> m (merge) | 383 b: both renamed from a -> m (merge) |
| 384 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 384 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 385 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 385 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
| 386 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 386 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 387 merge tool returned: 0 | 387 merge tool returned: 0 |
| 388 rev: versions differ -> m (merge) | 388 rev: versions differ -> m (merge) |
| 389 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 389 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 390 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | 390 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 391 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 391 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 392 merge tool returned: 0 | 392 merge tool returned: 0 |
| 393 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 393 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 394 (branch merge, don't forget to commit) | 394 (branch merge, don't forget to commit) |
| 395 -------------- | 395 -------------- |
| 396 M b | 396 M b |
| 421 c | 421 c |
| 422 preserving rev for resolve of rev | 422 preserving rev for resolve of rev |
| 423 c: remote created -> g | 423 c: remote created -> g |
| 424 getting c | 424 getting c |
| 425 rev: versions differ -> m (premerge) | 425 rev: versions differ -> m (premerge) |
| 426 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 426 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 427 merging rev | 427 merging rev |
| 428 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 428 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
| 429 rev: versions differ -> m (merge) | 429 rev: versions differ -> m (merge) |
| 430 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 430 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
| 432 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 432 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 433 merge tool returned: 0 | 433 merge tool returned: 0 |
| 434 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 434 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 435 (branch merge, don't forget to commit) | 435 (branch merge, don't forget to commit) |
| 436 -------------- | 436 -------------- |
| 437 M c | 437 M c |
| 451 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | 451 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
| 452 preserving b for resolve of b | 452 preserving b for resolve of b |
| 453 preserving rev for resolve of rev | 453 preserving rev for resolve of rev |
| 454 starting 4 threads for background file closing (?) | 454 starting 4 threads for background file closing (?) |
| 455 b: both created -> m (premerge) | 455 b: both created -> m (premerge) |
| 456 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 456 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 457 merging b | 457 merging b |
| 458 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | 458 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
| 459 rev: versions differ -> m (premerge) | 459 rev: versions differ -> m (premerge) |
| 460 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 460 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 461 merging rev | 461 merging rev |
| 462 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | 462 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
| 463 b: both created -> m (merge) | 463 b: both created -> m (merge) |
| 464 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 464 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 465 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | 465 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
| 466 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 466 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 467 merge tool returned: 0 | 467 merge tool returned: 0 |
| 468 rev: versions differ -> m (merge) | 468 rev: versions differ -> m (merge) |
| 469 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 469 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 470 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | 470 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
| 471 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 471 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 472 merge tool returned: 0 | 472 merge tool returned: 0 |
| 473 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 473 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 474 (branch merge, don't forget to commit) | 474 (branch merge, don't forget to commit) |
| 475 -------------- | 475 -------------- |
| 476 M b | 476 M b |
| 492 preserving rev for resolve of rev | 492 preserving rev for resolve of rev |
| 493 a: other deleted -> r | 493 a: other deleted -> r |
| 494 removing a | 494 removing a |
| 495 starting 4 threads for background file closing (?) | 495 starting 4 threads for background file closing (?) |
| 496 b: both created -> m (premerge) | 496 b: both created -> m (premerge) |
| 497 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 497 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 498 merging b | 498 merging b |
| 499 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 499 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 500 rev: versions differ -> m (premerge) | 500 rev: versions differ -> m (premerge) |
| 501 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 501 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 502 merging rev | 502 merging rev |
| 503 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 503 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 504 b: both created -> m (merge) | 504 b: both created -> m (merge) |
| 505 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 505 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 506 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 506 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 507 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 507 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 508 merge tool returned: 0 | 508 merge tool returned: 0 |
| 509 rev: versions differ -> m (merge) | 509 rev: versions differ -> m (merge) |
| 510 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 510 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 511 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 511 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 512 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 512 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 513 merge tool returned: 0 | 513 merge tool returned: 0 |
| 514 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 514 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 515 (branch merge, don't forget to commit) | 515 (branch merge, don't forget to commit) |
| 516 -------------- | 516 -------------- |
| 517 M b | 517 M b |
| 531 preserving b for resolve of b | 531 preserving b for resolve of b |
| 532 preserving rev for resolve of rev | 532 preserving rev for resolve of rev |
| 533 a: remote is newer -> g | 533 a: remote is newer -> g |
| 534 getting a | 534 getting a |
| 535 b: both created -> m (premerge) | 535 b: both created -> m (premerge) |
| 536 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 536 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 537 merging b | 537 merging b |
| 538 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 538 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 539 rev: versions differ -> m (premerge) | 539 rev: versions differ -> m (premerge) |
| 540 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 540 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 541 merging rev | 541 merging rev |
| 542 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 542 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 543 b: both created -> m (merge) | 543 b: both created -> m (merge) |
| 544 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 544 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 545 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 545 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 546 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 546 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 547 merge tool returned: 0 | 547 merge tool returned: 0 |
| 548 rev: versions differ -> m (merge) | 548 rev: versions differ -> m (merge) |
| 549 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 549 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 550 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 550 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 551 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 551 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 552 merge tool returned: 0 | 552 merge tool returned: 0 |
| 553 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 553 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 554 (branch merge, don't forget to commit) | 554 (branch merge, don't forget to commit) |
| 555 -------------- | 555 -------------- |
| 556 M a | 556 M a |
| 572 preserving rev for resolve of rev | 572 preserving rev for resolve of rev |
| 573 a: other deleted -> r | 573 a: other deleted -> r |
| 574 removing a | 574 removing a |
| 575 starting 4 threads for background file closing (?) | 575 starting 4 threads for background file closing (?) |
| 576 b: both created -> m (premerge) | 576 b: both created -> m (premerge) |
| 577 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 577 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 578 merging b | 578 merging b |
| 579 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 579 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 580 rev: versions differ -> m (premerge) | 580 rev: versions differ -> m (premerge) |
| 581 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 581 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 582 merging rev | 582 merging rev |
| 583 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 583 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 584 b: both created -> m (merge) | 584 b: both created -> m (merge) |
| 585 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 585 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 586 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 586 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
| 587 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 587 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 588 merge tool returned: 0 | 588 merge tool returned: 0 |
| 589 rev: versions differ -> m (merge) | 589 rev: versions differ -> m (merge) |
| 590 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 590 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 591 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 591 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 592 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 592 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 593 merge tool returned: 0 | 593 merge tool returned: 0 |
| 594 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 594 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 595 (branch merge, don't forget to commit) | 595 (branch merge, don't forget to commit) |
| 596 -------------- | 596 -------------- |
| 597 M b | 597 M b |
| 611 preserving b for resolve of b | 611 preserving b for resolve of b |
| 612 preserving rev for resolve of rev | 612 preserving rev for resolve of rev |
| 613 a: remote is newer -> g | 613 a: remote is newer -> g |
| 614 getting a | 614 getting a |
| 615 b: both created -> m (premerge) | 615 b: both created -> m (premerge) |
| 616 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 616 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 617 merging b | 617 merging b |
| 618 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 618 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 619 rev: versions differ -> m (premerge) | 619 rev: versions differ -> m (premerge) |
| 620 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 620 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 621 merging rev | 621 merging rev |
| 622 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 622 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 623 b: both created -> m (merge) | 623 b: both created -> m (merge) |
| 624 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 624 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 625 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 625 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
| 626 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 626 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 627 merge tool returned: 0 | 627 merge tool returned: 0 |
| 628 rev: versions differ -> m (merge) | 628 rev: versions differ -> m (merge) |
| 629 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 629 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 630 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 630 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 631 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 631 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 632 merge tool returned: 0 | 632 merge tool returned: 0 |
| 633 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 633 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 634 (branch merge, don't forget to commit) | 634 (branch merge, don't forget to commit) |
| 635 -------------- | 635 -------------- |
| 636 M a | 636 M a |
| 650 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | 650 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
| 651 preserving b for resolve of b | 651 preserving b for resolve of b |
| 652 preserving rev for resolve of rev | 652 preserving rev for resolve of rev |
| 653 starting 4 threads for background file closing (?) | 653 starting 4 threads for background file closing (?) |
| 654 b: both created -> m (premerge) | 654 b: both created -> m (premerge) |
| 655 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 655 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 656 merging b | 656 merging b |
| 657 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | 657 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
| 658 rev: versions differ -> m (premerge) | 658 rev: versions differ -> m (premerge) |
| 659 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 659 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 660 merging rev | 660 merging rev |
| 661 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 661 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 662 b: both created -> m (merge) | 662 b: both created -> m (merge) |
| 663 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 663 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 664 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | 664 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
| 665 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 665 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 666 merge tool returned: 0 | 666 merge tool returned: 0 |
| 667 rev: versions differ -> m (merge) | 667 rev: versions differ -> m (merge) |
| 668 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 668 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 669 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 669 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
| 670 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 670 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 671 merge tool returned: 0 | 671 merge tool returned: 0 |
| 672 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 672 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 673 (branch merge, don't forget to commit) | 673 (branch merge, don't forget to commit) |
| 674 -------------- | 674 -------------- |
| 675 M b | 675 M b |
| 693 a: prompt deleted/changed -> m (premerge) | 693 a: prompt deleted/changed -> m (premerge) |
| 694 picked tool ':prompt' for a (binary False symlink False changedelete True) | 694 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 695 other [merge rev] changed a which local [working copy] deleted | 695 other [merge rev] changed a which local [working copy] deleted |
| 696 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 696 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 697 b: both created -> m (premerge) | 697 b: both created -> m (premerge) |
| 698 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 698 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 699 merging b | 699 merging b |
| 700 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 700 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
| 701 rev: versions differ -> m (premerge) | 701 rev: versions differ -> m (premerge) |
| 702 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 702 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 703 merging rev | 703 merging rev |
| 704 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | 704 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 705 b: both created -> m (merge) | 705 b: both created -> m (merge) |
| 706 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 706 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 707 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 707 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
| 708 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 708 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 709 merge tool returned: 0 | 709 merge tool returned: 0 |
| 710 rev: versions differ -> m (merge) | 710 rev: versions differ -> m (merge) |
| 711 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 711 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 712 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | 712 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 713 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 713 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 714 merge tool returned: 0 | 714 merge tool returned: 0 |
| 715 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | 715 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
| 716 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 716 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 717 -------------- | 717 -------------- |
| 718 M a | 718 M a |
| 738 a: prompt changed/deleted -> m (premerge) | 738 a: prompt changed/deleted -> m (premerge) |
| 739 picked tool ':prompt' for a (binary False symlink False changedelete True) | 739 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 740 local [working copy] changed a which other [merge rev] deleted | 740 local [working copy] changed a which other [merge rev] deleted |
| 741 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 741 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 742 b: both created -> m (premerge) | 742 b: both created -> m (premerge) |
| 743 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 743 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 744 merging b | 744 merging b |
| 745 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 745 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
| 746 rev: versions differ -> m (premerge) | 746 rev: versions differ -> m (premerge) |
| 747 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 747 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 748 merging rev | 748 merging rev |
| 749 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | 749 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 750 b: both created -> m (merge) | 750 b: both created -> m (merge) |
| 751 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 751 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 752 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 752 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
| 753 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 753 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 754 merge tool returned: 0 | 754 merge tool returned: 0 |
| 755 rev: versions differ -> m (merge) | 755 rev: versions differ -> m (merge) |
| 756 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 756 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 757 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | 757 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
| 758 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 758 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 759 merge tool returned: 0 | 759 merge tool returned: 0 |
| 760 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | 760 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
| 761 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 761 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 762 -------------- | 762 -------------- |
| 763 M b | 763 M b |
| 782 preserving a for resolve of b | 782 preserving a for resolve of b |
| 783 preserving rev for resolve of rev | 783 preserving rev for resolve of rev |
| 784 removing a | 784 removing a |
| 785 starting 4 threads for background file closing (?) | 785 starting 4 threads for background file closing (?) |
| 786 b: remote moved from a -> m (premerge) | 786 b: remote moved from a -> m (premerge) |
| 787 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 787 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 788 merging a and b to b | 788 merging a and b to b |
| 789 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 789 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
| 790 rev: versions differ -> m (premerge) | 790 rev: versions differ -> m (premerge) |
| 791 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 791 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 792 merging rev | 792 merging rev |
| 793 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | 793 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 794 b: remote moved from a -> m (merge) | 794 b: remote moved from a -> m (merge) |
| 795 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 795 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 796 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 796 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
| 797 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 797 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 798 merge tool returned: 0 | 798 merge tool returned: 0 |
| 799 rev: versions differ -> m (merge) | 799 rev: versions differ -> m (merge) |
| 800 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 800 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 801 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | 801 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
| 802 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 802 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 803 merge tool returned: 0 | 803 merge tool returned: 0 |
| 804 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 804 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 805 (branch merge, don't forget to commit) | 805 (branch merge, don't forget to commit) |
| 806 -------------- | 806 -------------- |
| 807 M b | 807 M b |
| 824 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | 824 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
| 825 preserving b for resolve of b | 825 preserving b for resolve of b |
| 826 preserving rev for resolve of rev | 826 preserving rev for resolve of rev |
| 827 starting 4 threads for background file closing (?) | 827 starting 4 threads for background file closing (?) |
| 828 b: local copied/moved from a -> m (premerge) | 828 b: local copied/moved from a -> m (premerge) |
| 829 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 829 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 830 merging b and a to b | 830 merging b and a to b |
| 831 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | 831 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 832 rev: versions differ -> m (premerge) | 832 rev: versions differ -> m (premerge) |
| 833 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 833 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 834 merging rev | 834 merging rev |
| 835 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 835 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 836 b: local copied/moved from a -> m (merge) | 836 b: local copied/moved from a -> m (merge) |
| 837 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 837 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 838 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | 838 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 839 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | 839 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
| 840 merge tool returned: 0 | 840 merge tool returned: 0 |
| 841 rev: versions differ -> m (merge) | 841 rev: versions differ -> m (merge) |
| 842 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 842 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 843 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 843 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 844 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 844 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 845 merge tool returned: 0 | 845 merge tool returned: 0 |
| 846 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 846 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 847 (branch merge, don't forget to commit) | 847 (branch merge, don't forget to commit) |
| 848 -------------- | 848 -------------- |
| 849 M b | 849 M b |
| 872 preserving b for resolve of b | 872 preserving b for resolve of b |
| 873 preserving rev for resolve of rev | 873 preserving rev for resolve of rev |
| 874 c: remote created -> g | 874 c: remote created -> g |
| 875 getting c | 875 getting c |
| 876 b: local copied/moved from a -> m (premerge) | 876 b: local copied/moved from a -> m (premerge) |
| 877 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 877 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 878 merging b and a to b | 878 merging b and a to b |
| 879 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | 879 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
| 880 premerge successful | 880 premerge successful |
| 881 rev: versions differ -> m (premerge) | 881 rev: versions differ -> m (premerge) |
| 882 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 882 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 883 merging rev | 883 merging rev |
| 884 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | 884 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
| 885 rev: versions differ -> m (merge) | 885 rev: versions differ -> m (merge) |
| 886 picked tool 'python ../merge' for rev (binary False symlink False changedelete False) | 886 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
| 887 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | 887 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
| 888 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | 888 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
| 889 merge tool returned: 0 | 889 merge tool returned: 0 |
| 890 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 890 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 891 (branch merge, don't forget to commit) | 891 (branch merge, don't forget to commit) |
| 892 -------------- | 892 -------------- |
| 893 M b | 893 M b |