Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 625:978011cf5279
Cleanups for repo.pull
Use repo.pull in pull and clone commands
Teach clone about ssh:// (temporarily)
Fix up shutil issue on failed pull
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 05 Jul 2005 18:12:57 -0800 |
parents | 5e9e8b8d2629 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user hg update -m 1 rm b echo This is file c22 > c hg commit -t "commit #3" -d "0 0" -u user