Mercurial > hg
view tests/test-pull-update @ 5746:d3ef7e86bc3b
patchbomb: break lines > 80 chars (coding style)
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 18 Dec 2007 22:50:27 +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