Mercurial > hg
view tests/test-pull-update @ 10287:5da892be3497
check-code: add some ignore hints
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 28 Jan 2010 22:44:18 -0600 |
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