Mercurial > hg

view tests/test-merge2 @ 1033:5426c8248df6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with MPM.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 24 Aug 2005 12:50:11 -0700
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "0 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "0 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "0 0"
cd ..; /bin/rm -rf t