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.
$ hg init
$ echo a > a
$ hg ci -qAm 'add a'
$ echo b > b
$ hg ci -qAm 'add b'
$ hg up -qC 0
$ hg rm a
$ hg ci -m 'rm a'
created new head
$ hg up -qC 1
$ rm a
Local deleted a file, remote removed
Should fail, since there are deleted files:
$ hg merge
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
Should succeed with --force:
$ hg -v merge --force
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Should show 'a' as removed:
$ hg status
R a
$ hg ci -m merge
Should not show 'a':
$ hg manifest
b