Mercurial > hg
view tests/test-pull-update @ 9462:1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 10 Sep 2009 23:15:37 +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