branch | stable |
changeset 12795 | 3cb0559e44d0 |
parent 12793 | 469850088fc1 |
parent 12794 | 6bf8d48bec8e |
child 12796 | bc69ba99e34b |
--- a/tests/test-merge8 Wed Oct 20 23:39:48 2010 +0200 +++ /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