hg resolve

[Peter Arrenbrecht]

On Thu, Dec 18, 2008 at 6:26 PM, Matt Mackall <mpm at selenic.com> wrote:
> On Fri, 2008-12-12 at 15:31 -0800, Peter Loron wrote:
>> On Dec 10, 2008, at 4:36 PM, TK Soh wrote:
>>
>> > On Wed, Dec 10, 2008 at 3:54 PM, Peter Arrenbrecht
>> > <peter.arrenbrecht at gmail.com> wrote:
>> >> On Wed, Dec 10, 2008 at 11:11 AM, Leslie P. Polzer
>> >> <sky at viridian-project.de> wrote:
>> >>> Second issue, related: resolve without any arguments will
>> >>> just overwrite a fixed conflict, discarding any changes
>> >>> made.
>> >>>
>> >>> It should warn/ask the user interactively whether they
>> >>> really want to do that. Alternative: no default behaviour
>> >>> at all and a new switch that will restore the original
>> >>> conflicts.
>> >>
>> >> +1. This has bitten me more than once, too. But maybe it's too late
>> >> for removing the default (backward compat rules).
>> >
>> > If the rules have to be broken, it's better to do it while 1.1 is
>> > still 'warm'.
>>
>> +2  This would be a very good change.
>
> Sorry, you only get one vote.
>
> We plan to add a new -a switch analogous to revert's.

But no change to the default behaviour, meaning `hg resolve the/file`
will clobber any manual resolving I've already done when I meant to
say `hg resolve -m the/file`?
-parren