Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1 @ 413:a3b5347c22cd
remove double assignment
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
remove double assignment
spotted by Goffredo Baroncelli
manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG
vf/JwxHbQEqGrefU1nbs928=
=NDGW
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:07:13 -0800 |
parents | 0e0d0670b2bc |
children | 5b22029b5aa2 |
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 echo This is file b22 > b env HGMERGE=../merge hg update -m 2 # 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 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