Bazaar Subversion Plugin

What does conflicting tags mean?

Asked by dmuir

Got this while pulling from a bzr repo that is a checkout of an svn repo:

All changes applied successfully.
Now on revision 481.
Conflicting tags:
    ....
    [list of tags]
    ....

What does this mean? Couldn't find anything in the FAQ or in the bzr docs.

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Subversion Plugin Edit question
Assignee:
No assignee Edit question
Solved by:
Jelmer Vernooij
Solved:
Last query:
Last reply:
Revision history for this message
Jelmer Vernooij (jelmer) said : 		#1

On Mon, Mar 23, 2009 at 08:20:47AM -0000, dmuir wrote:
> New question #65053 on Bazaar Subversion Plugin:
> https://answers.launchpad.net/bzr-svn/+question/65053

> Got this while pulling from a bzr repo that is a checkout of an svn repo:

> All changes applied successfully.
> Now on revision 481.
> Conflicting tags:
> ....
> [list of tags]
> ....

> What does this mean? Couldn't find anything in the FAQ or in the bzr docs.

It means the tags in the remote branch point at different revisions
than the tags in the local branch.

cheers,

Jelmer

Revision history for this message
dmuir (dmuir) said : 		#2

As in one of the tags might be pointing at r400 in the remote branch but r395 in the local branch?
Is it a problem? Does it need fixing? What are the implications?

Revision history for this message
Best Jelmer Vernooij (jelmer) said : 		#3

yes, that would be it. it's not necessarily a problem, just says the tag points at a different revision in the local and the remote branch.

Revision history for this message
dmuir (dmuir) said : 		#4

Thanks Jelmer Vernooij, that solved my question.

Revision history for this message
ablmf@hotmail.com (ablmf) said : 		#5

It might not be a problem, but is there any way to get rid of it?

Revision history for this message
Jelmer Vernooij (jelmer) said : 		#6

You can get rid of it by changing the tags to be the same locally and remotely, or removing either.

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) said : 		#7

How do you know which tag is remote which is local and how the conflict is generated?

Revision history for this message
Jelmer Vernooij (jelmer) said : 		#8

You should get an error message saying which tags were conflicting.

You can use the "bzr tags" command to find out what the tags are pointing at locally and remotely (use "bzr tag -d bzr+ssh://..../" to access remote tags).