Hi,
On Nov/23/2009, Robert Millan wrote:
> 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.
I'm not in home now, but I'm very sure that I did:
bzr checkout of trunk (fresh checkout)
1.- cd grub
2.- bzr merge sftp://..... people/carles/gettext (as I understood from you
in IRC)
After some other things, I worked in carles/gettext in other things and
I did:
3.- cd carles/gettext (I had this from before)
4.- bzr pull of trunk??? (I don't think so)
5.- bzr commit
6.- bzr push (without any URL)
I used push but only in my branch.
I'm thinking if in some point (so point 3) I didn't move to
carles/gettext or if I in point 6 I wrote the trunk URL. These are the
only possible mistakes that I can think (possible but I think that I did
correctly)
I have all branches in home, if I can verify something for you I would
do at the evening.
--
Carles Pina i Estany
http://pinux.info
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
