[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#8623: 23.3.50; (woman "git-remote") crashes
From: |
Eli Zaretskii |
Subject: |
bug#8623: 23.3.50; (woman "git-remote") crashes |
Date: |
Sun, 08 May 2011 22:02:57 +0300 |
> 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.
- bug#8623: 23.3.50; (woman "git-remote") crashes, (continued)
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/05
- bug#8623: 23.3.50; (woman "git-remote") crashes, Eli Zaretskii, 2011/05/06
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/06
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/06
- bug#8623: 23.3.50; (woman "git-remote") crashes, Stefan Monnier, 2011/05/06
- bug#8623: 23.3.50; (woman "git-remote") crashes, Paul Eggert, 2011/05/06
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/08
- bug#8623: 23.3.50; (woman "git-remote") crashes, Paul Eggert, 2011/05/08
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/08
- bug#8623: 23.3.50; (woman "git-remote") crashes, Paul Eggert, 2011/05/08
- bug#8623: 23.3.50; (woman "git-remote") crashes,
Eli Zaretskii <=
- bug#8623: 23.3.50; (woman "git-remote") crashes, Eli Zaretskii, 2011/05/09
- bug#8623: 23.3.50; (woman "git-remote") crashes, Sven Joachim, 2011/05/09
- bug#8623: 23.3.50; (woman "git-remote") crashes, Eli Zaretskii, 2011/05/09
- bug#8623: 23.3.50; (woman "git-remote") crashes, Eli Zaretskii, 2011/05/08
- bug#8623: 23.3.50; (woman "git-remote") crashes, Eli Zaretskii, 2011/05/09
- bug#8623: 23.3.50; (woman "git-remote") crashes, Richard Stallman, 2011/05/07
- bug#8623: 23.3.50; (woman "git-remote") crashes, Paul Eggert, 2011/05/06