[issue1528] more user friendly merge for deleted files

[A. Klitzing]

New submission from A. Klitzing <aklitzing at online.de>:

If I merge a branch it can sometimes happen that mercurial will ask the
following hundred times (with other filename of course):

   remote changed inc/lang/de/admin.txt which local deleted
   use (c)hanged version or leave (d)eleted?

There should be a way to group this question. I often want to "delete all" or
only hold one directory. And I don't want to press "d" hundred times for that. ;-)

Proposal:
If Mercurial would ask more then "20" times it should consider subdirectories
and ask something like:

   remote changed 123 files in inc/lang/* which local deleted
   use (c)hanged version or leave (d)eleted for all or select (m)anually?

If the user press "m" it will ask for every next subdirectory (or so):

   remote changed 21 files in inc/lang/de/* which local deleted
   use (c)hanged version or leave (d)eleted for all or select (m)anually?

[...]

   remote changed 102 files in inc/lang/en/* which local deleted
   use (c)hanged version or leave (d)eleted for all or select (m)anually?

----------
messages: 8709
nosy: misery
priority: feature
status: unread
title: more user friendly merge for deleted files
topic: merge, ui

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1528>
____________________________________________________