Mercurial > hg > pyhgsh
view tests/test-merge2 @ 2052:c0b945c5df08
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 07 Apr 2006 20:08:11 -0500 |
parents | 7544700fd931 |
children |
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