Mercurial > hg
view tests/test-pull-update @ 5434:f9c2917a9f7a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 09 Oct 2007 17:25:24 -0500 |
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