[RFC] BzrTagging updates

[Jelmer Vernooij]

On Thu, 2006-06-22 at 19:43 +1000, Robert Collins wrote:
> > >  * How do we handle conflicts? 
> > 
> > (To recap) The basic idea is that tag definitions are edited through the
> > working tree object; and a conflict in them is also present in the tree
> > and resolved there.
> > 
> > To start with I would suggest we just simply write out a .bzrtags
> > in human-readable form containing herringbone conflict markers.
> > 
> > Although handling tag conflicts properly is important, they will
> > probably be relatively rare and so we shouldn't block on working out
> > exact how they'll work.  We have the option in future to e.g. always
> > prefer the local tag, or do some kind of smarter interactive resolution.
> 
> 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?

Btw, You mentioned a couple of days ago you had another idea for tags,
using lightweight branches - any chance you could comment a bit on
those?

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060623/ffd75885/attachment.pgp