On Mon, Nov 23, 2009 at 10:59:34AM +0100, Carles Pina i Estany wrote: > > bzr checkout of trunk (fresh checkout) > 1.- cd grub > 2.- bzr merge sftp://..... people/carles/gettext (as I understood from you > in IRC)
These two by themselves don't modify the remote tree (you'd need bzr commit) > 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) bzr push without any URL uses an implicit value, which *could* be our remote trunk (use bzr info to check). Always use an explicit value when pushing, or check first with bzr info! -- 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
