[merge] tags in Branch

[Martin Pool]

Here's an updated tags patch, which I would like to merge for 0.15.  It
builds on the resultobject change I just posted to give a

This works similarly to the patch posted before, but puts the tags in
the branch.  This also does a smarter two-way merge between tags on
operations that transfer tags, so that existing tag definitions are not
overwritten.  Instead you get output after the command saying the tags
conflict.

I think this will be good in the common cases where tags are set and
rarely changed.

We can do proper history-based merges of tags in the future if we want
by adding a new Branch format.

This also allows tags to be any unicode string.

Tags are stored in a bencoded file within the branch.

Tags are added to Branch6, added earlier in this cycle.

There is at least one thing that must be done before merging and that is
to change merge to also return a Result object and report tag conflicts
in there.  But that should not be a large change so I thought I would
let most of this be reviewed now.  (merge currently does the same
behaviour, it just doesn't report it).

Thanks to everyone who reviewed the previous patch.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20070226-tags.diff
Type: text/x-patch
Size: 66471 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070226/957ecb59/attachment-0001.bin