From: Eli Zaretskii <eliz@gnu.org>
To: svenjoac@gmx.de, eggert@cs.ucla.edu
Cc: 8623-done@debbugs.gnu.org
Subject: bug#8623: 23.3.50; (woman "git-remote") crashes
Date: Mon, 09 May 2011 13:10:47 +0300 [thread overview]
Message-ID: <837ha0jiag.fsf@gnu.org> (raw)
In-Reply-To: <83iptlj9r2.fsf@gnu.org>
> Date: Sun, 08 May 2011 22:02:57 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: eggert@cs.ucla.edu, 8623@debbugs.gnu.org
>
> cd emacs-23 && bzr merge -r103939.1.41..103939.1.42 ../trunk
>
> because the changes you want were committed in revision 103939.1.42.
For the record, a few more revisions seem to be needed, I missed them
at first. Here's the correct bzr command line:
bzr merge -r103939.1.40..103939.1.44 ../trunk
I missed those other revisions because it is quite hard to figure out
which revisions committed by Paul on his local branch actually fix
this one problem. The eventual merge onto the trunk (revision 104021)
included many more changes, which are unrelated to this problem.
Paul, would it be possible for you to merge individual features or
bugfixes? Or at least clearly mark in the commit logs where a fix for
a particular problem begins and where it ends? This would make such
jobs in the future much easier and less error-prone. TIA
I committed the resulting changes (after fixing a few gotchas) to the
emacs-23 branch (revision 100571). I only did some minimal testing,
so please report any residual bugs. For now, I'm closing this bug
report.
next prev parent reply other threads:[~2011-05-09 10:10 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
2011-05-09 10:10 ` Eli Zaretskii [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=837ha0jiag.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=8623-done@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 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.