Code review comment for lp:~jelmer/bzr-builddeb/automatic-distribution-name

On Sun, 2008-11-30 at 20:31 +0000, Jelmer Vernooij wrote:
> Am Freitag, den 28.11.2008, 16:01 +0000 schrieb James Westby:
> > You can do a plain "bzr merge" to merge in in the changes from
> > Ubuntu. This will work fine if you have -1 and they have -1ubuntu1.
> But you wouldn't be using merge-upstream in that case (as you mentioned
> earlier)? It seems if you wanted to use m-u in this case, my previous
> patch would be useful.

True, but m-u support for branches means that it is possible now doesn't
it?

> > If however you don't have the upstream that they have yet then
> > you will get problems as the upstream version is not tagged in
> > your branch with the "debian" tag.
> >
> > That's a bug and not really related to your changes. I don't know a
> > way to solve this yet, do you have any ideas?
> I'm not sure I understand what you mean here. Do you mean that the wrong
> revision will be tagged as upstream if you merge from another
> Debian/Ubuntu branch rather than the actual upstream?

The upstream revision will only get the "ubuntu" version of the tag, not
the "debian" one. There needs to be two tags for representing historic
information as sometimes the tarballs were different, and you don't
want the tags to conflict as you merge. Perhaps that was a bad decision.

We either need some way to tag the upstream when you merge, or to change
the code to fall-back to the other tag if the one for the current distro
isn't found.

Thanks,

James