From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#8623: 23.3.50; (woman "git-remote") crashes Date: Mon, 09 May 2011 13:10:47 +0300 Message-ID: <837ha0jiag.fsf@gnu.org> References: <878vukrjsu.fsf@turtle.gmx.de> <83d3jwnai7.fsf@gnu.org> <87zkn0q2bx.fsf@turtle.gmx.de> <8362pom8ww.fsf@gnu.org> <87pqnwhzmr.fsf@turtle.gmx.de> <87hb98huq3.fsf@turtle.gmx.de> <4DC409F0.6010005@cs.ucla.edu> <87mxix8l82.fsf@turtle.gmx.de> <4DC6C620.6010708@cs.ucla.edu> <87fwop6qck.fsf@turtle.gmx.de> <83iptlj9r2.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1304935874 18693 80.91.229.12 (9 May 2011 10:11:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 9 May 2011 10:11:14 +0000 (UTC) Cc: 8623-done@debbugs.gnu.org To: svenjoac@gmx.de, eggert@cs.ucla.edu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 09 12:11:10 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QJNQh-0001gs-SB for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 May 2011 12:11:08 +0200 Original-Received: from localhost ([::1]:37443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJNQg-0000XM-SV for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 May 2011 06:11:06 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJNQe-0000XD-5t for bug-gnu-emacs@gnu.org; Mon, 09 May 2011 06:11:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJNQd-0003Vz-8s for bug-gnu-emacs@gnu.org; Mon, 09 May 2011 06:11:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJNQd-0003Vu-7L for bug-gnu-emacs@gnu.org; Mon, 09 May 2011 06:11:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QJNQc-0000h6-T3 for bug-gnu-emacs@gnu.org; Mon, 09 May 2011 06:11:02 -0400 Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 09 May 2011 10:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 8623 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 8623@debbugs.gnu.org, eliz@gnu.org Original-Received: via spool by 8623-done@debbugs.gnu.org id=D8623.13049358522650 (code D ref 8623); Mon, 09 May 2011 10:11:02 +0000 Original-Received: (at 8623-done) by debbugs.gnu.org; 9 May 2011 10:10:52 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJNQS-0000gg-6h for submit@debbugs.gnu.org; Mon, 09 May 2011 06:10:52 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJNQP-0000gQ-Lw for 8623-done@debbugs.gnu.org; Mon, 09 May 2011 06:10:50 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LKX00A00AQQXO00@a-mtaout23.012.net.il> for 8623-done@debbugs.gnu.org; Mon, 09 May 2011 13:10:43 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.234.175]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LKX00ALRAXTLG70@a-mtaout23.012.net.il>; Mon, 09 May 2011 13:10:42 +0300 (IDT) In-reply-to: <83iptlj9r2.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 09 May 2011 06:11:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:46346 Archived-At: > Date: Sun, 08 May 2011 22:02:57 +0300 > From: Eli Zaretskii > 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.