Mercurial > public > mercurial-scm > hg
diff tests/test-fetch @ 6226:bd61e44eb2cc
fetch: don't proceed if working directory is missing files (issue988)
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 11 Mar 2008 11:38:12 -0700 |
| parents | 03b13d853dc6 |
| children | d16798000be0 |
line wrap: on
line diff
--- a/tests/test-fetch Tue Mar 11 11:30:42 2008 -0700 +++ b/tests/test-fetch Tue Mar 11 11:38:12 2008 -0700 @@ -52,5 +52,12 @@ echo g > g/g hg --cwd g ci -d '6 0' -Amg +hg clone -q f h +hg clone -q g i + echo % should merge f into g hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f + +rm i/g +echo % should abort, because i is modified +hg --cwd i fetch ../h