Mercurial > hg
view tests/test-pull-update @ 9302:73bec717b825
help: improve "hg help revisions"
Add info about branch names, and other clarifications.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Sun, 02 Aug 2009 19:21:47 -0700 |
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