Mercurial > hg
view tests/test-pull-update @ 8646:60f9e574b6eb
localrepo: use lock.release for single lock
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Wed, 27 May 2009 14:16:13 +0200 |
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