Comment 34 for bug 494481

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/19/2011 8:35 PM, James Westby wrote:
> 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
>

I'm pretty sure this is: bug #785116

It wouldn't surprise me too much if lp:ubuntu/* branches ended up as
stacked branches with absolutely 0 local revisions (vs the dev focus).

One option would be to use "bzr push --overwrite -r -2" or something
like that. "uncommit" fails because it is trying to show the log of the
last commit.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3Vbu8ACgkQJdeBCYSNAAP3LQCdHha/VvC4DyxZdQDaf7p1U9MN
sKkAmQG+2vckWFzLNVemGjgXiFQhDlrl
=iXwD
-----END PGP SIGNATURE-----