Mercurial > hg
view tests/test-pull-update @ 8080:19229b0b292d
cvsps: make debugging easier by adding __repr__() methods.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Sat, 18 Apr 2009 09:43:21 -0400 |
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