[RFC] A bit of lovin for tags
John Arbash Meinel
john at arbash-meinel.com
Mon Jul 21 18:16:08 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
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'?
(The fact I don't know is probably telling.)
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkiExFgACgkQJdeBCYSNAAM8XgCgs7Tidemfq9DPhA2THZcbL7XC
Io4Anja7az+MfMCR9AvTYyFzJwd7Pp5l
=En2Z
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list