Mercurial > hg

view tests/manifest-bug @ 187:aa9a0d50e612

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two minor merge bugs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix two minor merge bugs Fix variable name for printing manifest node Trouble with empty between lists from remote repos manifest hash: 000e9267b17c870f673210c8aae50d99e0e5b72b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO CLpuRURCB5Ang19YZ5MLGeg= =NF1T -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 28 May 2005 13:59:09 -0800
parents 9f64ee817199
children
line wrap: on
line source

#!/bin/sh -x

set +e

BASE=foo.base
BR1=foo.br1
BR2=foo.br2
BR2_1=foo.br2_1

mkdir $BASE
cd $BASE
hg init
echo test > file
hg add file
EDITOR="echo 'initial commit' > " hg commit
cd ..

mkdir $BR1
cd $BR1
hg branch ../$BASE
hg checkout
echo test > file1
hg addremove
EDITOR="echo side commit >" hg commit
cd ..

mkdir $BR2
cd $BR2
hg branch ../$BASE
hg checkout
echo yet more >> file2
hg addremove
EDITOR="echo second update >" hg commit
cd ..

mkdir $BR2_1
cd $BR2_1
hg branch ../$BR2
hg checkout
EDITOR="echo commit merge >" hg merge ../$BR1

hg checkout