From: Juanma Barranquero <lekktu@gmail.com>
To: Alan Mackenzie <acm@muc.de>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Help me unstick my bzr, please.
Date: Sat, 16 Jan 2010 22:32:49 +0100 [thread overview]
Message-ID: <f7ccd24b1001161332s7895dd0dh851aa69c7eb14bd0@mail.gmail.com> (raw)
In-Reply-To: <20100116212708.GA6676@muc.de>
On Sat, Jan 16, 2010 at 22:27, Alan Mackenzie <acm@muc.de> wrote:
> My mistake was I tried to move my changes from "quickfixes" to "trunk"
> using "bzr merge". 'bzr help merge' doesn't say what is merged with what
> where, sadly.
You said:
> I attempt to merge the change into my "trunk" branch by doing this:
>
> ~/emacs/emacs.bzr/quickfixes$ bzr merge
which is the wrong way. If you want to merge changes *from* a branch
*into* trunk, you should do
cd trunk
bzr update # to make sure trunk is up to date
bzr merge ../quickfixes # or the task branch, etc.
> I think what I really want is 'bzr push'. Is this correct?
No.
> The documentation for 'bzr push' is not helpful.
Sadly true.
Juanma
prev parent reply other threads:[~2010-01-16 21:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 22:27 Help me unstick my bzr, please Alan Mackenzie
2010-01-16 2:37 ` Giorgos Keramidas
2010-01-16 7:48 ` Eli Zaretskii
2010-01-16 8:29 ` Stephen J. Turnbull
2010-01-16 8:41 ` Stephen J. Turnbull
2010-01-16 8:59 ` Eli Zaretskii
2010-01-17 6:04 ` Stephen J. Turnbull
2010-01-16 9:02 ` Giorgos Keramidas
2010-01-16 9:57 ` Eli Zaretskii
2010-01-16 10:04 ` Giorgos Keramidas
2010-01-16 9:16 ` Lennart Borgman
2010-01-16 9:53 ` Andreas Schwab
2010-01-16 9:54 ` Eli Zaretskii
2010-01-16 9:59 ` Giorgos Keramidas
2010-01-16 10:02 ` Lennart Borgman
2010-01-16 11:17 ` Eli Zaretskii
2010-01-17 6:23 ` Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Stephen J. Turnbull
2010-01-16 19:36 ` Help me unstick my bzr, please Stefan Monnier
2010-01-16 21:38 ` Alan Mackenzie
2010-01-17 7:50 ` Giorgos Keramidas
2010-01-16 10:10 ` Eli Zaretskii
2010-01-16 21:27 ` Alan Mackenzie
2010-01-16 21:32 ` Juanma Barranquero [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7ccd24b1001161332s7895dd0dh851aa69c7eb14bd0@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=acm@muc.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).