Mercurial > hg
view tests/test-pull-update @ 10488:93b5a957294c stable
i18n-sv: synchronized with 44b4a2a31623
author | Jens Bäckman <jens.backman@gmail.com> |
---|---|
date | Tue, 16 Feb 2010 22:01:27 +0100 |
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