tests/test-transplant.t
changeset 34661 eb586ed5d8ce
parent 34251 61714510220d
child 35708 03e921942163
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   260   $ hg clone -r 1 ../t ../sameparent
   260   $ hg clone -r 1 ../t ../sameparent
   261   adding changesets
   261   adding changesets
   262   adding manifests
   262   adding manifests
   263   adding file changes
   263   adding file changes
   264   added 2 changesets with 2 changes to 2 files
   264   added 2 changesets with 2 changes to 2 files
       
   265   new changesets 17ab29e464c6:d11e3596cc1a
   265   updating to branch default
   266   updating to branch default
   266   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   267   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   267   $ cd ../sameparent
   268   $ cd ../sameparent
   268   $ hg transplant --log -s ../prune 5
   269   $ hg transplant --log -s ../prune 5
   269   searching for changes
   270   searching for changes
   280   $ hg clone -r 1 ../t ../remote
   281   $ hg clone -r 1 ../t ../remote
   281   adding changesets
   282   adding changesets
   282   adding manifests
   283   adding manifests
   283   adding file changes
   284   adding file changes
   284   added 2 changesets with 2 changes to 2 files
   285   added 2 changesets with 2 changes to 2 files
       
   286   new changesets 17ab29e464c6:d11e3596cc1a
   285   updating to branch default
   287   updating to branch default
   286   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   288   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   287   $ cd ../remote
   289   $ cd ../remote
   288   $ hg --config diff.noprefix=True transplant --log -s ../t 2 4
   290   $ hg --config diff.noprefix=True transplant --log -s ../t 2 4
   289   searching for changes
   291   searching for changes
   337   $ hg clone -r 0 ../t ../rp
   339   $ hg clone -r 0 ../t ../rp
   338   adding changesets
   340   adding changesets
   339   adding manifests
   341   adding manifests
   340   adding file changes
   342   adding file changes
   341   added 1 changesets with 1 changes to 1 files
   343   added 1 changesets with 1 changes to 1 files
       
   344   new changesets 17ab29e464c6
   342   updating to branch default
   345   updating to branch default
   343   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   346   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   344   $ cd ../rp
   347   $ cd ../rp
   345   $ hg transplant -s http://localhost:$HGPORT/ 37a1297eb21b a53251cdf717
   348   $ hg transplant -s http://localhost:$HGPORT/ 37a1297eb21b a53251cdf717
   346   searching for changes
   349   searching for changes
   349   adding manifests
   352   adding manifests
   350   adding file changes
   353   adding file changes
   351   added 1 changesets with 1 changes to 1 files
   354   added 1 changesets with 1 changes to 1 files
   352   applying a53251cdf717
   355   applying a53251cdf717
   353   a53251cdf717 transplanted to 8d9279348abb
   356   a53251cdf717 transplanted to 8d9279348abb
       
   357   new changesets 37a1297eb21b:8d9279348abb
   354   $ hg log --template '{rev} {parents} {desc}\n'
   358   $ hg log --template '{rev} {parents} {desc}\n'
   355   2  b3
   359   2  b3
   356   1  b1
   360   1  b1
   357   0  r1
   361   0  r1
   358 
   362 
   540   $ hg transplant -s ../t -b tip -a
   544   $ hg transplant -s ../t -b tip -a
   541   adding changesets
   545   adding changesets
   542   adding manifests
   546   adding manifests
   543   adding file changes
   547   adding file changes
   544   added 4 changesets with 4 changes to 4 files
   548   added 4 changesets with 4 changes to 4 files
       
   549   new changesets 17ab29e464c6:a53251cdf717
   545 
   550 
   546 test "--merge" causing pull from source repository on local host
   551 test "--merge" causing pull from source repository on local host
   547 
   552 
   548   $ hg --config extensions.mq= -q strip 2
   553   $ hg --config extensions.mq= -q strip 2
   549   $ hg transplant -s ../t --merge tip
   554   $ hg transplant -s ../t --merge tip
   553   adding manifests
   558   adding manifests
   554   adding file changes
   559   adding file changes
   555   added 2 changesets with 2 changes to 2 files
   560   added 2 changesets with 2 changes to 2 files
   556   applying a53251cdf717
   561   applying a53251cdf717
   557   4:a53251cdf717 merged at 4831f4dc831a
   562   4:a53251cdf717 merged at 4831f4dc831a
       
   563   new changesets 722f4667af76:4831f4dc831a
   558 
   564 
   559 test interactive transplant
   565 test interactive transplant
   560 
   566 
   561   $ hg --config extensions.strip= -q strip 0
   567   $ hg --config extensions.strip= -q strip 0
   562   $ hg -R ../t log -G --template "{rev}:{node|short}"
   568   $ hg -R ../t log -G --template "{rev}:{node|short}"
   843   $ hg clone -r0 binarysource binarydest
   849   $ hg clone -r0 binarysource binarydest
   844   adding changesets
   850   adding changesets
   845   adding manifests
   851   adding manifests
   846   adding file changes
   852   adding file changes
   847   added 1 changesets with 1 changes to 1 files
   853   added 1 changesets with 1 changes to 1 files
       
   854   new changesets 07f494440405
   848   updating to branch default
   855   updating to branch default
   849   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   856   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   850   $ cd binarydest
   857   $ cd binarydest
   851   $ cp ../binarysource/b b
   858   $ cp ../binarysource/b b
   852   $ hg ci -Am addb2 b
   859   $ hg ci -Am addb2 b