Mercurial > hg
view tests/test-merge1 @ 1113:6130de75bb2a
Updated manpage and help.
Updated manpage on change to hg status; standardized description
of -print0 options.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Sat, 27 Aug 2005 18:55:14 -0700 |
parents | 0902ffece4b4 |
children | 67a28636ea64 |
line wrap: on
line source
#!/bin/sh 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 -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "0 0" 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 -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "0 0" 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 -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" echo This is file b22 > b hg commit -m "commit #2" -d "0 0" hg update 1 echo This is file c1 > c hg add c hg commit -m "commit #3" -d "0 0" 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 -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" echo This is file b22 > b hg commit -m "commit #2" -d "0 0" hg update 1 echo This is file c1 > c hg add c hg commit -m "commit #3" -d "0 0" echo This is file b33 > b env HGMERGE=../merge hg update -m 2 # merge of b expected cd ..; /bin/rm -rf t