Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 2483:5583d5ef257e
Fixed conditional include of stdint.h for windows/msvc6/python2.3 environment.
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Thu, 22 Jun 2006 13:19:52 +0900 |
parents | 7544700fd931 |
children | 9dcf9d45cab8 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg update 0 echo This is file b2 > b hg add b hg commit -m "commit #2" -d "1000000 0" 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 "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "1000000 0" 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 "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "1000000 0" cd ..; /bin/rm -rf t