Mercurial > hg
view tests/test-pull-update @ 6283:5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 15 Mar 2008 22:03:18 -0300 |
parents | 73fdc8bd3ed8 |
children |
line wrap: on
line source
#!/bin/sh # hg init t cd t echo 1 > foo hg ci -Am m cd .. hg clone t tt cd tt echo 1.1 > foo hg ci -Am m cd ../t echo 1.2 > foo hg ci -Am m echo % should fail hg pull -u ../tt cd ../tt echo % should fail hg pull -u ../t HGMERGE=true hg merge hg ci -mm cd ../t echo % should work hg pull -u ../tt