(partly) updated Tagging spec

[Alexander Belchenko]

Martin Pool пишет:
> I've updated the tagging spec to add more use cases, and try to express
> them in a way that doesn't assume a solution.
> 
>   http://bazaar-vcs.org/BzrTagging
> 
> In reviewing that text with Robert & Andrew we had some better ideas
> about how to implement them, which I hope will resolve the concerns
> people had with various other proposals.  I'm going to add that in now
> and will post when it's done.
> 
> The basic idea is that tags should be represented by directories in the
> filesystem or url namespace, just as branches are.  

I have proposal for resolving conflicts part. From document:

Resolve conflicting tag definitions

The same name is assigned to different revisions in two branches. This
is allowed, even if the two branches are stored in the same repository.
When the two branches are merged, the user doing the merge must choose
one definition (or remove the tag).

In the initial implementation users might be required to just edit the
file directly to make a choice:

vi .bzr/checkout


My proposal:

When tags conflict is detected bzr will create file tags.conflict or
something similar in the root of tree. Content of this file similar to
conflicts markers in text files:

>>>>>> TREE
tag TAGNAME -> revno/revid
======
tag TAGNAME -> revno/revid
<<<<<< SOURCE-TREE

And user should edit this file and choose right variant. When user then do

bzr resolved tags

and bzr inspect current state of tags.conflict file and make decision.

--
Alexander