equal
deleted
inserted
replaced
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
437 (branch merge, don't forget to commit) |
437 (branch merge, don't forget to commit) |
438 $ hg ci -m 'merging something' |
438 $ hg ci -m 'merging something' |
439 $ cd .. |
439 $ cd .. |
440 $ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap |
440 $ echo "53792d18237d2b64971fa571936869156655338d 6d955580116e82c4b029bd30f321323bae71a7f0" >> branchpruning-hg2/.hg/shamap |
441 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug |
441 $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2 --debug --config progress.debug=true |
442 run hg source pre-conversion action |
442 run hg source pre-conversion action |
443 run hg sink pre-conversion action |
443 run hg sink pre-conversion action |
444 scanning source... |
444 scanning source... |
445 scanning: 1 revisions |
445 scanning: 1 revisions |
446 sorting... |
446 sorting... |