view tests/test-merge8 @ 11709:3e561b6af810 stable

mq: clarify the fact that qimport is trying to read a file "hg qimport tip" would throw "abort: unable to read tip" before this.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 31 Jul 2010 10:50:29 +0900
parents efbe24c7d8d9
children
line wrap: on
line source

#!/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