From: Eli Zaretskii <eliz@gnu.org>
To: Sven Joachim <svenjoac@gmx.de>
Cc: eggert@cs.ucla.edu, 8623@debbugs.gnu.org
Subject: bug#8623: 23.3.50; (woman "git-remote") crashes
Date: Sun, 08 May 2011 22:02:57 +0300 [thread overview]
Message-ID: <83iptlj9r2.fsf@gnu.org> (raw)
In-Reply-To: <87fwop6qck.fsf@turtle.gmx.de>
> From: Sven Joachim <svenjoac@gmx.de>
> Cc: Stefan Monnier <monnier@iro.umontreal.ca>, Eli Zaretskii <eliz@gnu.org>, 8623@debbugs.gnu.org
> Date: Sun, 08 May 2011 19:42:51 +0200
>
> Sans src/ChangeLog, I get merge conflicts in 15 files (trying with the
> git mirror and "git cherry-pick", since I'm not familiar with bzr).
bzr doesn't give any merge conflicts in src/ChangeLog (but I have the
changelog_merge plugin installed). The way to cherry-pick with bzr is
this:
cd emacs-23 && bzr merge -r103939.1.41..103939.1.42 ../trunk
because the changes you want were committed in revision 103939.1.42.
next prev parent reply other threads:[~2011-05-08 19:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 20:09 bug#8623: 23.3.50; (woman "git-remote") crashes Sven Joachim
2011-05-05 20:44 ` Eli Zaretskii
2011-05-05 21:12 ` Sven Joachim
2011-05-06 10:15 ` Eli Zaretskii
2011-05-06 10:50 ` Sven Joachim
2011-05-06 12:36 ` Sven Joachim
2011-05-06 14:39 ` Stefan Monnier
2011-05-06 14:47 ` Paul Eggert
2011-05-08 11:50 ` Sven Joachim
2011-05-08 16:34 ` Paul Eggert
2011-05-08 17:42 ` Sven Joachim
2011-05-08 18:22 ` Paul Eggert
2011-05-08 19:02 ` Eli Zaretskii [this message]
2011-05-09 10:10 ` Eli Zaretskii
2011-05-09 15:09 ` Sven Joachim
2011-05-09 15:28 ` Eli Zaretskii
2011-05-08 19:27 ` Eli Zaretskii
2011-05-09 10:13 ` Eli Zaretskii
2011-05-07 11:32 ` Richard Stallman
2011-05-06 14:37 ` Paul Eggert
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=83iptlj9r2.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=8623@debbugs.gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=svenjoac@gmx.de \
/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).