Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 675:49de76abc4da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg clone stored path fix # HG changeset patch # User Mikael Berthe <mikael@lilotux.net> # Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9 # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d hg clone stored path fix The abspath() has been lost in changeset 634 (da5378d39269).
author Mikael Berthe <mikael@lilotux.net>
date Sun, 10 Jul 2005 16:15:20 -0800
parents feadc9697b43
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

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

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

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