Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6 @ 620:7369ec5d93f2
Attempt to handle RSS URIs properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to handle RSS URIs properly
manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL
SAJKUYknvv4IJDUyHjQc61k=
=zGdJ
-----END PGP SIGNATURE-----
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Jul 2005 15:42:26 -0800 |
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