Mercurial > hg
diff tests/test-issue3084.t @ 19954:427ce5633c1c stable
largefiles: don't prompt for normal/largefile changes when doing plain updates
We used to get like:
$ hg up -r 2
foo has been turned into a normal file
keep as (l)argefile or use (n)ormal file? l
getting changed largefiles
0 largefiles updated, 0 removed
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ cat foo
cat: foo: No such file or directory
[1]
- which both asked the wrong question and did the wrong thing.
Instead, skip this conflict resolution when the local conflicting file has been
scheduled for removal and there thus is no conflict.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 25 Oct 2013 02:33:59 +0800 |
parents | 894a5897a9dd |
children | 7985e3469f58 |
line wrap: on
line diff
--- a/tests/test-issue3084.t Fri Oct 25 02:25:10 2013 +0800 +++ b/tests/test-issue3084.t Fri Oct 25 02:33:59 2013 +0800 @@ -109,4 +109,31 @@ $ cat foo large +Whatever ... commit something so we can invoke merge when updating + + $ hg commit -m '3: Merge' + +Updating from largefile to normal - no reason to prompt + + $ hg up -r 2 + getting changed largefiles + 0 largefiles updated, 0 removed + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ cat foo + normal + +(the update above used to leave the working dir in a very weird state - clean it + $ hg up -qr null + $ hg up -qr 2 +) + +Updating from normal to largefile - no reason to prompt + + $ hg up -r 3 + getting changed largefiles + 1 largefiles updated, 0 removed + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ cat foo + large + $ cd ..