tests/simple-merge
author mpm@selenic.com
Sun, 12 Jun 2005 08:51:11 -0800
changeset 316 c48d069163d6
parent 28 9f64ee817199
permissions -rw-r--r--
Add new convert-repo script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add new convert-repo script This is the beginnings of a generalized framework for converting repositories. Currently hardwired to convert from git to hg. manifest hash: dc3b72de2c45bfdaffcc1cf71da530228793facd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrGf/ywK+sNU5EO8RAi9EAJ0eQ++cwSgn5j2PHiTvF7r3JNiv4gCePY+X do12pUvCczyBKVCoBN7y/uI= =YtzI -----END PGP SIGNATURE-----

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