Mercurial > hg
view tests/test-pull-update @ 7612:069b29656401
web: use the correct filectx in filelog
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 09 Jan 2009 17:34:06 +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