Mercurial > hg
view tests/test-pull-update @ 5941:b710296c904a
Update usage message in test-glog.out
AKA: Remind Thomas to run tests even after trivial changes.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 25 Jan 2008 21:09:14 +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