author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Wed, 11 Oct 2006 16:41:52 +0200 | |
changeset 3331 | f472cf9a71af |
parent 2990 | 61fcd9fac434 |
child 5798 | 86f5d8f608b7 |
permissions | -rwxr-xr-x |
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "fetch=" >> $HGRCPATH hg init a echo a > a/a hg --cwd a commit -d '1 0' -Ama hg clone a b hg clone a c echo b > a/b hg --cwd a commit -d '2 0' -Amb hg --cwd a parents -q echo % should pull one change hg --cwd b fetch ../a hg --cwd b parents -q echo c > c/c hg --cwd c commit -d '3 0' -Amc hg --cwd c fetch -d '4 0' -m 'automated merge' ../a ls c