On Mon, Nov 23, 2009 at 02:40:28AM +0100, Vladimir 'φ-coder/phcoder' Serbinenko wrote: > I managed to unmerge our mainstream by using raw revid (visible with bzr > log -n0 --show-ids) by > bzr branch -r revid:<..revid..> mainline mainline-real > If you comitted recently please check if nothing is missing > Carles: check your locations in > .bzr/branch/branch.conf
Thanks Vladimir. Btw, there's also "bzr uncommit". Carles, can you explain the sequence of commands you used for this to happen? I think I told you yesterday not to use "bzr push", and I can't think of another way that would lead to this. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
