view tests/manifest-bug @ 310:273f6a01d18b

hg patch: add default commit text -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg patch: add default commit text I was doing some benchmarks via hg import and found a few patches where the commit string ended up empty. hg would then try to prompt you for the commit string. The patch below forces a default string based on the patch name. Signed-off-by: Chris Mason <mason@suse.com> Modified to only be added if there's no commit text - mpm manifest hash: 35da46e3832a98e2d288604e6be8c82e85405ef8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqg+/ywK+sNU5EO8RAqCIAJ4/Nj6c3MusY3HyD8HeHjqc+GlFMQCbBWA5 HhCmOoJuL5Uoz7WlGPlpumw= =M3/j -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 10 Jun 2005 14:10:07 -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