[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging emacs-24
From: |
Glenn Morris |
Subject: |
Re: merging emacs-24 |
Date: |
Wed, 26 Nov 2014 22:48:12 -0500 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Thanks for trying.
The ChangeLogs don't look right. All merged new entries should have gone
to the top (this was trivial with bzr's changelog-merge plugin, probably
git has something similar) and got today's date.
Also, the ChangeLogs for the changes marked "backport" (etc, check for
any commit that matches bzrmerge-skip-regexp) have all been merged back
to trunk, leading to duplicate entries. The new ones should all be
removed. This is part of what bzrmerge.el handled.
BTW: with bzr, the logs for the merged changes would be visible with
bzr log -n0
How does one do that with git log?
Re: merging emacs-24, Ted Zlatanov, 2014/11/26
- Re: merging emacs-24, Óscar Fuentes, 2014/11/26
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Eli Zaretskii, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/27
- Re: merging emacs-24, Eli Zaretskii, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/27
- Re: merging emacs-24, Eli Zaretskii, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/28
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28