Mercurial > hg

comparison tests/test-bundle-r @ 10479:bb508b312359 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: exclude csets given in --base, unless they are in --rev (issue1910) Thanks Jesse Glick for the first version of this patch.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 16 Nov 2009 16:10:05 -0500
parents c0b449154a90
children 65b178f30eae
comparison
equal deleted inserted replaced
10477:44b4a2a31623 10479:bb508b312359
73 hg -R test bundle --base 2 test-bundle-all.hg 73 hg -R test bundle --base 2 test-bundle-all.hg
74 hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg 74 hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
75 75
76 # issue76 msg2163 76 # issue76 msg2163
77 hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg 77 hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
78 # issue1910
79 hg -R test bundle --base 7 test-bundle-cset-7.hg
78 80
79 hg clone test-2 test-9 81 hg clone test-2 test-9
80 cd test-9 82 cd test-9
81 echo % 2 83 echo % 2
82 hg tip -q 84 hg tip -q
97 hg rollback 99 hg rollback
98 hg unbundle ../test-bundle-branch2.hg 100 hg unbundle ../test-bundle-branch2.hg
99 echo % 6 101 echo % 6
100 hg tip -q 102 hg tip -q
101 hg verify 103 hg verify
104 hg rollback
105 hg unbundle ../test-bundle-cset-7.hg
106 echo % 4
107 hg tip -q
108 hg verify
102 109
103 cd ../test 110 cd ../test
104 hg merge 7 111 hg merge 7
105 hg ci -m merge -d "1000000 0" 112 hg ci -m merge -d "1000000 0"
106 cd .. 113 cd ..