Mercurial > hg
view tests/test-pull-update @ 12100:4d6bb7615564
tests: unify test-remove-new
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 30 Aug 2010 13:08:18 +0900 |
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