Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1 @ 507:dd8b19114fe7
README: mention lib64/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
README: mention lib64/
manifest hash: 66865206771f64e1257235c8cf551edf77d2712c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwSemywK+sNU5EO8RAn/kAJ9NhZLCNdOI09rSL22p6zVsoMLyXACdGzVh
6hfXMuxEjn84xTLS4xJ2OLo=
=VQie
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 02:34:14 -0800 |
parents | 5b22029b5aa2 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b1 > b env HGMERGE=../merge hg update -m 1 # no merges expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b2 > b env HGMERGE=../merge hg update -m 1 # merge of b expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user cat b echo This is file b22 > b env HGMERGE=../merge hg update -m 2 # merge expected! cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user echo This is file b33 > b env HGMERGE=../merge hg update -m 2 # merge of b expected cd ..; /bin/rm -rf t