Mercurial > hg
comparison tests/test-fetch @ 7049:6489ee64b522
fetch: use dirstate branch instead of first parents
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 24 Sep 2008 13:22:11 +0200 |
parents | a6b74fbb5ce0 |
children | 58fd3c718ca4 |
comparison
equal
deleted
inserted
replaced
7048:25961e53a07f | 7049:6489ee64b522 |
---|---|
154 hg -R n2 fetch -d '9 0' -m 'merge' n1 | 154 hg -R n2 fetch -d '9 0' -m 'merge' n1 |
155 echo '% parent should be 3 (fetch did not merge anything)' | 155 echo '% parent should be 3 (fetch did not merge anything)' |
156 hg -R n2 parents --template '{rev}\n' | 156 hg -R n2 parents --template '{rev}\n' |
157 rm -fr n1 n2 | 157 rm -fr n1 n2 |
158 | 158 |
159 echo % pull in change on different branch than dirstate | |
160 hg init n1 | |
161 echo a > n1/a | |
162 hg -R n1 ci -Am initial | |
163 hg clone n1 n2 | |
164 echo b > n1/a | |
165 hg -R n1 ci -m next | |
166 hg -R n2 branch topic | |
167 hg -R n2 fetch -d '0 0' -m merge n1 | |
168 echo '% parent should be 0 (fetch did not update or merge anything)' | |
169 hg -R n2 parents --template '{rev}\n' | |
170 rm -fr n1 n2 | |
171 | |
159 true | 172 true |