Ubuntu Distributed Development

  1. Bug #494481
  2. Comment #33

Comment 33 for bug 494481

Revision history for this message
James Westby (james-w) wrote : Re: [Bug 494481] Re: Too easy for people to not use merge-upstream

On Thu, 19 May 2011 12:46:25 -0000, Matthieu Baerts <email address hidden> wrote:
> Sorry but what can we do for cairo-dock branches? lp:ubuntu/cairo-dock, lp:ubuntu/natty/cairo-dock, lp:ubuntu/cairo-dock-plug-ins, lp:ubuntu/natty/cairo-dock-plug-ins ?
> It seems a few upstream-* tags are missing because 'bzr merge-upstream' has not been used and I guess it's maybe easier to uncommit a few revisions but how many? I guess the rev 23 on lp:ubuntu/cairo-dock is incorrect but what about the older? Can you help me to fix these broken branch?

Hi,

I've just tried to uncommit those revisions from the branch so that we
can get back to a known-good state, but something odd is going on.

Simply running bzr uncommit lp:ubuntu/maverick/cairo-dock gives a
backtrace complaining of NoSuchRevision, and I'm not sure why. Could
someone from the bzr team take a look please?

Thanks,

James