[RFC] BzrTagging updates

[Martin Pool]

On 23 Jun 2006, Jelmer Vernooij <jelmer at samba.org> wrote:
> On Thu, 2006-06-22 at 19:43 +1000, Robert Collins wrote:

> > I like the idea of conflicts being exposed in a simple file to edit. I'm
> > tempted to say that that should not be in the user source dir though.
> Perhaps 'bzr tag --resolve' should simply bring up the users editor
> editing a temporary file, just like we do for the commit messages?

I think we will want a more general "please help me interactively
resolve this" command, and this would be one mode under there.  That
could help explain about structural conflicts (renames/deletions/etc),
text conflicts.

-- 
Martin