view tests/simple-merge @ 308:075619d00dd7

Add tip to tags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add tip to tags This makes a tag for the current tip that always overrides what's in the tags files. manifest hash: b1a17d0238aa84ee30773be79e4a32dca321a0c3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCqfzVywK+sNU5EO8RAgdEAJ41VvLHIIzNZbIC/nHmoJOpZL0+4gCfRxpC eSq341nfmMZNcrqmGYYALe4= =miH1 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 10 Jun 2005 12:49:25 -0800
parents 9f64ee817199
children
line wrap: on
line source

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify