Help with gatekeeper workflow.

[Kent Gibson]

Eric Berry wrote:
>
>
>     Except tags - I don't think 'bzr merge <merge-directive>' propagates
>     tags - even if the merge directive includes a public branch.
>
> I just tested this locally, and you are correct. Tags do not come with
> the merge directive.
Which is a bummer, since it means you still need a public branch if you
want to propagate tags, and you need to merge manually, not with a
merge-directive.
>
> I also tried to do a merge between the two directories, and the tags
> do not come across that way either.
>
That's weird.  I tried 'bzr merge <local branch>' and that does
propagate the tags for me.  That is using both bzr 1.12 and bzr.dev.

Exactly how are you testing?
This is what I'm doing :

I have two instances of a test branch, test1 and test2.
There are a couple of dummy checkins just so there are some revisions
there to play with.
Both instances start with no tags, and are otherwise up to date with
each other.
I add a tag to test1, then push, pull or merge it into test2.
e.g.
kent at arithon:~/work/bzr/test2$ bzr tags
kent at arithon:~/work/bzr/test1$ cd ../test1
kent at arithon:~/work/bzr/test1$ bzr tags
kent at arithon:~/work/bzr/test1$ bzr tag test_tag
Created tag test_tag.
kent at arithon:~/work/bzr/test1$ bzr tags
test_tag             2
kent at arithon:~/work/bzr/test1$ cd ../test2
kent at arithon:~/work/bzr/test2$ bzr merge ../test1
Nothing to do.
kent at arithon:~/work/bzr/test2$ bzr tags
test_tag             2
kent at arithon:~/work/bzr/test2$

As you can see, the tag has been propagated from test1 to test2 by the
merge (yeah - that is despite it reporting "Nothing to do").

> Are tags supposed to be transferred with a merge?
>
As I understand it, tags should be propagated by branch, push, pull and
merge.
The branch is a straight copy, since the destination is being created
from scratch.  The others do a merge of the source tags with the
destination tags, with the destination taking precedence if there are
any conflicts.
If you use the --overwrite option on push or pull then the source tags
get precedence instead.

Cheers,
Kent.