comparison tests/test-convert-filemap.t @ 19863:daeab82fa644

convert: fix crash when existing converted revision didn't come from source This case can happen when converting from multiple repositories with filemap.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Oct 2013 19:46:48 +0200
parents 42455ebbab9f
children aa9385f983fa
comparison
equal deleted inserted replaced
19862:42455ebbab9f 19863:daeab82fa644
408 o 1 "closedefault" files: 408 o 1 "closedefault" files:
409 | 409 |
410 o 0 "addb" files: b 410 o 0 "addb" files: b
411 411
412 412
413 Test rebuilding of map with unknown revisions in shamap - it used to crash
414
415 $ cd branchpruning
416 $ hg up -r 2
417 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
418 $ hg merge 4
419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
420 (branch merge, don't forget to commit)
421 $ hg ci -m 'merging something'
422 $ cd ..
423 $ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap
424 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug
425 run hg source pre-conversion action
426 run hg sink pre-conversion action
427 scanning source...
428 scanning: 1 revisions
429 sorting...
430 converting...
431 0 merging something
432 source: 2503605b178fe50e8fbbb0e77b97939540aa8c87
433 converting: 0/1 revisions (0.00%)
434 unknown revmap source: 53792d18237d2b64971fa571936869156655338d
435 run hg sink post-conversion action
436 run hg source post-conversion action
437
438
413 filemap rename undoing revision rename 439 filemap rename undoing revision rename
414 440
415 $ hg init renameundo 441 $ hg init renameundo
416 $ cd renameundo 442 $ cd renameundo
417 $ echo 1 > a 443 $ echo 1 > a