Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6 @ 698:df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use python function instead of external 'cp' command when cloning repos.
Inspired by a patch from Stephen Darnell.
manifest hash: b525b0bf40f349b362db7c46d62be41572ef65cf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1ncZW7P1GVgWeRoRAiJmAJ9GaCPaG6yOKb72I+SpDDdcdXTISACePD0H
GR/F+qqzi2imdgIV77ziLcQ=
=YVd2
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 14 Jul 2005 15:30:49 +0100 |
parents | d96c1153b25d |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge export HGMERGE=./merge mkdir A1 cd A1 hg init echo This is file foo1 > foo echo This is file bar1 > bar hg add foo bar hg commit -t "commit text" -d "0 0" -u user cd .. hg clone A1 B1 cd A1 rm bar hg remove bar hg commit -t "commit test" -d "0 0" -u user cd ../B1 echo This is file foo22 > foo hg commit -t "commit test" -d "0 0" -u user cd .. hg clone A1 A2 hg clone B1 B2 cd A1 hg pull ../B1 hg update -m hg commit -t "commit test" -d "0 0" -u user echo bar should remain deleted. hg manifest cd ../B2 hg pull ../A2 hg update -m hg commit -t "commit test" -d "0 0" -u user echo bar should remain deleted. hg manifest