Mercurial > hg
view tests/test-merge2 @ 2775:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 Aug 2006 15:24:41 -0500 |
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