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: Sun, 08 May 2011 22:02:57 +0300 Message-ID: <83iptlj9r2.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1304881519 4092 80.91.229.12 (8 May 2011 19:05:19 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 8 May 2011 19:05:19 +0000 (UTC) Cc: eggert@cs.ucla.edu, 8623@debbugs.gnu.org To: Sven Joachim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 08 21:05:14 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 1QJ9I1-0000gH-0P for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 May 2011 21:05:13 +0200 Original-Received: from localhost ([::1]:60929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJ9I0-00065C-HE for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 May 2011 15:05:12 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:33162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJ9Hu-000615-WD for bug-gnu-emacs@gnu.org; Sun, 08 May 2011 15:05:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJ9Hq-0005MV-TI for bug-gnu-emacs@gnu.org; Sun, 08 May 2011 15:05:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJ9Hq-0005MO-PS for bug-gnu-emacs@gnu.org; Sun, 08 May 2011 15:05:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QJ9Hq-0005F8-Cv; Sun, 08 May 2011 15:05:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 08 May 2011 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8623 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 8623-submit@debbugs.gnu.org id=B8623.130488145020094 (code B ref 8623); Sun, 08 May 2011 19:05:02 +0000 Original-Received: (at 8623) by debbugs.gnu.org; 8 May 2011 19:04:10 +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 1QJ9H0-0005E2-HC for submit@debbugs.gnu.org; Sun, 08 May 2011 15:04:10 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ9Gy-0005Dp-D8 for 8623@debbugs.gnu.org; Sun, 08 May 2011 15:04:09 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LKW004004P21000@a-mtaout23.012.net.il> for 8623@debbugs.gnu.org; Sun, 08 May 2011 22:02:54 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.234.175]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LKW003SC4WSQB40@a-mtaout23.012.net.il>; Sun, 08 May 2011 22:02:54 +0300 (IDT) In-reply-to: <87fwop6qck.fsf@turtle.gmx.de> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 08 May 2011 15:05: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:46325 Archived-At: > From: Sven Joachim > Cc: Stefan Monnier , Eli Zaretskii , 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.