Comment 4 for bug 842575

Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 842575] Re: Missing file reported after resolved removal conflict

Hash: SHA1

On 10/4/2011 4:59 PM, Vincent Ladeuil wrote:
> 'bzr resolve --all' is evil, it only get rid of the conflicts and
> remove the associated helpers (.BASE, .THIS, .OTHER or whatever).
> The really evil part is that 'bzr resolve --all --take-other' does
> what you expect: resolve the conflict by taking the 'OTHER'
> version.
> This is related to bug #344013 and bug #389396 and there is also a
> FIXME in bzrlib/ (wrongly mentioning bug 383396, that's
> a typo).
> This bug is not really a duplicate so I leave it alone.

The issue is that 'bzr resolve' was originally designed as a "mark
this as resolved".

It needed 'bzr resolve --all' so that you wouldn't have to specify
each file when you fixed 10 files.

It then grew the ability to notice what was resolved and what wasn't,
so you could just say "bzr resolve".

It then grew the ability to take an action. So instead of being bzr
'mark-resolved' it suddenly became bzr 'help-me-resolve-the-conflict'.

I feel like we really need to create 2 separate commands. It is
possible the original intent should be the one renamed. (bzr
mark-resolved, bzr resolved, etc.)


Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla -