Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-copy-move-merge @ 5084:edfe69548e2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
posixfile_nt: '+' should allow read access. This fixes unexpected I/O error on committing many files due to cset:8a53b39cd402 (r4902 in crew).
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Wed, 25 Jul 2007 15:58:10 +0900
parents 8d9bdcbb2b18
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c