Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-bundle-r @ 3293:a225055b3b59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle --base: use the right set for the base
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 15:44:20 +0200
parents 484e6b7e7062
children ef8307585b41
comparison
equal deleted inserted replaced
3291:0b5d626b354e 3293:a225055b3b59
70 70
71 hg -R test bundle --base 2 -r tip test-bundle-branch1.hg 71 hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
72 hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg 72 hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
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 cd test-2 75 hg clone test-2 test-9
76 cd test-9
76 echo % 2 77 echo % 2
77 hg tip -q 78 hg tip -q
78 hg unbundle ../test-bundle-should-fail.hg 79 hg unbundle ../test-bundle-should-fail.hg
79 echo % 2 80 echo % 2
80 hg tip -q 81 hg tip -q
81 hg unbundle ../test-bundle-all.hg 82 hg unbundle ../test-bundle-all.hg
82 echo % 8 83 echo % 8
83 hg tip -q 84 hg tip -q
85 hg verify
84 hg rollback 86 hg rollback
85 echo % 2 87 echo % 2
86 hg tip -q 88 hg tip -q
87 hg unbundle ../test-bundle-branch1.hg 89 hg unbundle ../test-bundle-branch1.hg
88 echo % 4 90 echo % 4
89 hg tip -q 91 hg tip -q
92 hg verify
93 hg rollback
90 hg unbundle ../test-bundle-branch2.hg 94 hg unbundle ../test-bundle-branch2.hg
91 echo % 8 95 echo % 6
92 hg tip -q 96 hg tip -q
93 hg verify 97 hg verify
98
99 cd ../test
100 hg merge 7
101 hg ci -m merge -d "1000000 0"
102 cd ..
103 hg -R test bundle --base 2 test-bundle-head.hg
104 hg clone test-2 test-10
105 cd test-10
106 hg unbundle ../test-bundle-head.hg
107 echo % 9
108 hg tip -q
109 hg verify