fails to import vlc 0.9.4 into ~lp:motumedia/vlc/vlc

[Reinhard Tartler]

Binary package hint: bzr-builddeb

21:45:31 < siretart> james_w: I try to import http://incoming.debian.org/vlc_0.9.4-1.dsc into lp:~motumedia/vlc/vlc..
21:46:04 < siretart> james_w: the branch has 0.9.2, debian has skipped 0.9.3
21:47:22 < james_w> siretart: should work
21:48:33 < siretart> bzr: ERROR: No such tag: upstream-debian-0.9.3
21:48:37 < siretart> that's what I get
21:48:49 < siretart> which is correct, but doesn't help me :)
21:50:08 < james_w> siretart: ah, yeah, I'll need to help you convert to the new way of doing things.
21:50:25 < james_w> siretart: it will be better, I promise :-)
21:50:33 < directhex> mmmmm krispy kreme
21:50:40 < james_w> siretart: there just wasn't a good way to automatically transition
21:50:55 < james_w> siretart: can you give me pointers to the branches that you use?
21:52:12 < siretart> james_w: a checkout of lp:~motumedia/vlc/vlc
21:53:07 < james_w> siretart: thanks, I'll take a look
21:56:34 < james_w> siretart: ah, sorry, I misunderstood
21:56:49 < james_w> siretart: it's a bug, let me investigate

[James Westby (james-w)]

Hi,

As discussed on IRC this isn't really a bug, as you were mixing the "debian" and
"ubuntu" branches.

I would like to try and improve the situation by improving the error message.
Any suggestions for how this could be explained in an error message would be
appreciated.

Thanks,

James

[Alex Muntada (alex.muntada)]

The section "Importing a source package from elsewhere" in bzr-builddeb
user manual reads:

    During the life of a package it is possible that an upload will be done
    where the changes are not included in the branch, perhaps if an NMU
    is done. This also applies to Ubuntu when merging packages with new
    Debian uploads.

It seems to me that import-dsc should work as explained on the manual.
If this is not a bug and there's a work-around or a better way to do this
kind of imports, could you please elaborate and update the manual too?

Thanks a lot!

[James Westby (james-w)]

On Mon, 2008-10-27 at 19:08 +0000, Alex Muntada wrote:
> The section "Importing a source package from elsewhere" in bzr-builddeb
> user manual reads:
>
> During the life of a package it is possible that an upload will be done
> where the changes are not included in the branch, perhaps if an NMU
> is done. This also applies to Ubuntu when merging packages with new
> Debian uploads.
>
> It seems to me that import-dsc should work as explained on the manual.
> If this is not a bug and there's a work-around or a better way to do this
> kind of imports, could you please elaborate and update the manual too?

I don't think the documentation is incorrect, but it could be clearer
on what actually needs to be done to merge a Debian package.

Thanks,

James

[Alex Muntada (alex.muntada)]

I still have no clue on how to solve this problem. I'm stuck with my "ubuntu" branch and now I want to import current "debian" branch from a debian .dsc, so how should I proceed?

[Alex Muntada (alex.muntada)]

I think I found it:

$ bzr tags
upstream-1.32 1
$ bzr tag upstream-debian-1.32 -r tag:upstream-1.32
Created tag upstream-debian-1.32.
$ bzr tags
upstream-1.32 1
upstream-debian-1.32 1
$ bzr import-dsc --distribution=debian ../libflickr-upload-perl_1.32-2.dsc

Just in case it's worth adding to bzr-builddeb docs.

[James Westby (james-w)]

Hi,

This should now work with no problem with the latest bzr-builddeb

Thanks,

James