From: Glenn Morris <rgm@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: some bzrmerge.el questions
Date: Tue, 18 Jan 2011 13:30:18 -0500 [thread overview]
Message-ID: <6h39oqcbet.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwvk4i22qsq.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Tue\, 18 Jan 2011 10\:12\:08 -0500")
Stefan Monnier wrote:
> There is simply no way in Bzr to merge part of a branch history: the
> only kind of merge info recorded in the metadata says "all the branch
> upto <foo> has been merged".
Oh I think I see. `bzr help merge' implies (to me) that it works, but
in detail it doesn't, eg
https://lists.ubuntu.com/archives/bazaar/2010q3/069894.html
Anyway; it's off-topic for this list. Thankfully I can just M-x
bzrmerge without worrying about the details. :)
prev parent reply other threads:[~2011-01-18 18:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 20:29 some bzrmerge.el questions Glenn Morris
2011-01-13 21:43 ` Stefan Monnier
2011-01-14 7:12 ` Glenn Morris
2011-01-14 8:19 ` Glenn Morris
2011-01-14 17:30 ` Eli Zaretskii
2011-01-14 17:44 ` Glenn Morris
2011-01-14 19:00 ` Glenn Morris
2011-01-14 17:48 ` Glenn Morris
2011-01-14 18:39 ` Stefan Monnier
2011-01-15 20:44 ` Glenn Morris
2011-01-16 4:30 ` Stefan Monnier
2011-01-17 17:58 ` martin rudalics
2011-01-17 19:29 ` Stefan Monnier
2011-01-18 3:04 ` Glenn Morris
2011-01-18 15:12 ` Stefan Monnier
2011-01-18 18:30 ` Glenn Morris [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6h39oqcbet.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.