[RFC] BzrTagging updates

[Robert Collins]

On Thu, 2006-06-22 at 19:37 +1000, Martin Pool wrote:
> On 20 Jun 2006, Jelmer Vernooij <jelmer at samba.org> wrote:
> > Hi,
> > 
> > I'm looking at updating Gustavo's patch for tags to work with current
> > Bazaar. I've made some updates to the BzrTagging
> > (http://bazaar-vcs.org/BzrTagging) wiki page to contain the spec of what
> > I'd like to implement. 
> 
> Thanks, that's good.
> > The main two open questions are:
> > 
> >  * Should the tags control file be a branch or repository property ?
> 
> What I have in mind for that spec is that the tags are stored in a
> VersionedFile (knit, whatever) in the repository.  The branch indicates
> which version of that file should be consulted.

As long as we dont have to do a 'commit' to update the tags file, this
sounds nice.


> >  * 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.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060622/21a9ae39/attachment.pgp