changeset 11981 | 518b90d66fad |
parent 11980 | c443e95d295b |
child 11982 | 56d9b73487ff |
--- a/tests/test-merge8 Wed Aug 18 05:54:00 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh - -# Test for changeset ba7c74081861 -# (update dirstate correctly for non-branchmerge updates) -hg init a -cd a -echo a > a -hg add a -hg commit -m a -cd .. -hg clone a b -cd a -hg mv a b -hg commit -m move -echo b >> b -hg commit -m b -cd ../b -hg pull ../a -hg update