Tags are wrong in lp:ubuntu/cairo-dock

[Matthieu Baerts]

Hello,

It seems that tags are wrong in lp:ubuntu/cairo-dock because "bzr merge-upstream" says that there is no "upstream-2.2.0~4" tag and if I add it, it removes the debian directory.
Note that the import fails with lp:ubuntu/cairo-dock-plug-ins too => LP: #704694

[Jelmer Vernooij (jelmer)]

On Mon, 2011-04-11 at 20:24 +0000, Matthieu Baerts wrote:
> It seems that tags are wrong in lp:ubuntu/cairo-dock because "bzr merge-upstream" says that there is no "upstream-2.2.0~4" tag and if I add it, it removes the debian directory.
> Note that the import fails with lp:ubuntu/cairo-dock-plug-ins too => LP: #704694
It's correct that the upstream tag points at a tree without a debian/
branch, as upstream usually doesn't include a debian/ directory.

Can you be a bit more specific about what you're trying to run ?

  status incomplete

Cheers,

Jelmer

[Matthieu Baerts (matttbe)]

I want to update cairo-dock packages on Ubuntu.
This is the merge proposal: https://code.launchpad.net/~cairo-dock-team/ubuntu/natty/cairo-dock/2.3.0-0rc1/+merge/51034

My sponsor said that I've to use "bzr merge-upstream". This is what I did but with an error. I had to add "upstream-2.2.0~4" and then if has worked.
This is the commands that I used:
    bzr branch lp:ubuntu/cairo-dock
    cd cairo-dock
    bzr merge-upstream --version 2.3.0~0rc1 ../../cairo-dock_2.3.0~0rc1.orig.tar.gz --distribution=natty # => it said that there is no upstream-2.2.0~4 tag...
    bzr tag upstream-2.2.0~4
    bzr merge-upstream --version 2.3.0~0rc1 ../../cairo-dock_2.3.0~0rc1.orig.tar.gz --distribution=natty # now it said that there is no debian directory.

I report this problem on #ubuntu-motu (and also that there is worth with lp:ubuntu/cairo-dock-plug-ins) and somebody said that these branches seem broken.