Mercurial > hg

view tests/test-merge2 @ 662:b55a78595ef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass username to hgeditor, remove temporary file # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Pass username to hgeditor, remove temporary file
author Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
date Sun, 10 Jul 2005 16:00:17 -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