Switch tag version

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sylvain Bonnemaison wrote:
> I'm updating my source code using '~openerp/openobject-addons/4.2/'. I
> get the following message during update process :
> 
> Update branch '..\..\dev.sources\python\OpenERP Addons 4.2'
> Using saved location:
> bzr+ssh://sylvain.bonnemaison@bazaar.launchpad.net/~openerp/openobject-addons/4.2/
> 
> No revisions to pull.
> Conflicting tags:
>    4.2.3.3
> 
> What does it mean? How to solve this problem?
> 
> Thanks.
> 
> 

It means you have a tag "4.2.3.3" which points at a revision different
from the tag with the same name at lp:~openerp/open-object-addons/4.2

I believe "bzr pull --overwrite" will force your local tags to be
identical to the remote tags. I don't think there is a flag for "update"
to do the same.

Most likely someone changed their mind about what the value the tag
should have. However, we don't have a way of knowing which one is "more"
correct. (You might have changed your side, or they changed their side.
Hence the "conflict".)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjO3ZMACgkQJdeBCYSNAANltgCdEvG9TfgI9mJUBTDGDSpbHtXN
XqwAoL1N5d03TwDL1N8Oz2Qh2nqEi8uL
=4XpC
-----END PGP SIGNATURE-----