Mercurial > hg
comparison tests/test-issue3084.t @ 18724:894a5897a9dd stable
largefiles: getstandinmatcher should not depend on existence of directories
Looking for a (potentially empty) directory was not reliable - both because it
is a reasonable assumption that empty directories can be removed and because it
wasn't created in all cases ... such as when pulling to an existing repository.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Feb 2013 13:45:18 +0100 |
| parents | c9db897d5a43 |
| children | 427ce5633c1c |
comparison
equal
deleted
inserted
replaced
| 18723:e56f7cd8c67b | 18724:894a5897a9dd |
|---|---|
| 29 | 29 |
| 30 $ echo "n" | hg merge --config ui.interactive=Yes | 30 $ echo "n" | hg merge --config ui.interactive=Yes |
| 31 foo has been turned into a largefile | 31 foo has been turned into a largefile |
| 32 use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 32 use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 33 (branch merge, don't forget to commit) | 33 (branch merge, don't forget to commit) |
| 34 getting changed largefiles | |
| 35 0 largefiles updated, 0 removed | |
| 34 | 36 |
| 35 $ hg status | 37 $ hg status |
| 36 $ cat foo | 38 $ cat foo |
| 37 normal | 39 normal |
| 38 | 40 |