Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 1114:58371c4c2c8f
Remove the lock file copied during clone (was the source lock file)
Index: hg/mercurial/commands.py
===================================================================
author | Stephen Darnell |
---|---|
date | Sat, 27 Aug 2005 19:15:02 -0700 |
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