Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 1159:b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing),
people should make sure they write strings.
author | Vincent Wagelaar <vincent@ricardis.tudelft.nl> |
---|---|
date | Tue, 30 Aug 2005 10:57:52 +0200 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
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 "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg update 0 echo This is file b2 > b hg add b hg commit -m "commit #2" -d "0 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 "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "0 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 "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "0 0" cd ..; /bin/rm -rf t