[RFC] A bit of lovin for tags

[Martin Pool]

On Tue, Jul 22, 2008 at 3:31 AM, Russ Brown <pickscrape at gmail.com> wrote:
> John Arbash Meinel wrote:
>> At the moment, if someone changes a tag to point at a new revision, the
>> propagation and conflict resolution is a bit difficult.
>>
>> Specifically, when you pull someone else's changes, it just says
>> "Conflicting tags:XXX". Which is a bit short, and doesn't really tell
>> you if the other work succeeded or failed, or how to resolve these
>> conflicting tags.
>>
>> Also, if the tags were versioned, we would be able to detect that this
>> is a simple supersede of the earlier tag value.
>>
>> chadmiller on IRC suggests this warning text:
>>
>> "Your %(verb)s completed, but upstream disagrees about which revisions
>> these tags should appear on.  Your tags were not updated.  Conflicts:\n"
>>
>>
>> I don't think we can do a lot more than give friendlier messages until
>> we decide to version tags. And I don't think we have any UI for actually
>> getting the new values, except for maybe a 'pull --force'?

You can get them by running 'bzr tags REMOTE' and then 'bzr tag -r
VALUE NAME' to put that value into your local tags.  I think a bzr
pull --overwrite-tags should probably do that, and arguably it should
be the default for pull as opposed to merge.

I agree that message is better.

-- 
Martin <http://launchpad.net/~mbp/>