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

On Fri, 2008-11-28 at 15:27 +0000, Jelmer Vernooij wrote:
> On Fri, 2008-11-28 at 15:03 +0000, James Westby wrote:
> > On Fri, 2008-11-28 at 14:59 +0000, Jelmer Vernooij wrote:
> > > It allows merging Ubuntu branches from Debian and the other way around.
> > > E.g. If I merge some Ubuntu package with version 1.2-2ubuntu1 into my
> > > Debian branch, which would already have 1.2-2, I end up with 1.2-3.
> >
> > Yes, but you wouldn't use "merge-upstream" for that would you?
> > "merge-upstream" is intended to merge a new upstream tarball in to your
> > branch.
> Yeah, I guess that's true. Should we error out then if we find that the
> upstream version already includes an debian version?

This would be for merging from a branch I assume?

I'm not sure we should be erroring out.

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.

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?

Thanks,

James