branch | stable |
changeset 12795 | 3cb0559e44d0 |
parent 12793 | 469850088fc1 |
parent 12794 | 6bf8d48bec8e |
child 12796 | bc69ba99e34b |
--- a/tests/test-pull-update Wed Oct 20 23:39:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -#!/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