Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 4997:81f8ff2a9bf2

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 93a4e72b4f83
children
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status