GNU bug report logs - #8623
23.3.50; (woman "git-remote") crashes

Previous Next

Package: emacs;

Reported by: Sven Joachim <svenjoac <at> gmx.de>

Date: Thu, 5 May 2011 20:10:03 UTC

Severity: normal

Found in version 23.3.50

Done: Eli Zaretskii <eliz <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Eli Zaretskii <eliz <at> gnu.org>
To: Sven Joachim <svenjoac <at> gmx.de>
Cc: eggert <at> cs.ucla.edu, monnier <at> iro.umontreal.ca, 8623 <at> debbugs.gnu.org
Subject: bug#8623: 23.3.50; (woman "git-remote") crashes
Date: Sun, 08 May 2011 22:02:57 +0300

> From: Sven Joachim <svenjoac <at> gmx.de>
> Cc: Stefan Monnier <monnier <at> iro.umontreal.ca>,  Eli Zaretskii <eliz <at> gnu.org>,  8623 <at> 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.
This bug report was last modified 14 years and 100 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.