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

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?

Cheers,

Jelmer

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>