[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging emacs-24
From: |
Stefan Monnier |
Subject: |
Re: merging emacs-24 |
Date: |
Fri, 28 Nov 2014 09:29:38 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> perfect job. AFAICS, gitmerge.el doesn't fix that (maybe it should
> try), so manual labor is still required.
I haven't checked gitmerge.el, but bzrmerge.el had special code to do
the ChangeLog merge, and at some point at least it did it better (or at
least, more closely to our conventions) than Bzr's
"changelog-merge" plugin.
Stefan
- Re: merging emacs-24, (continued)
- Re: merging emacs-24, Stefan Monnier, 2014/11/27
- Re: merging emacs-24, David Engster, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/27
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Stephen J. Turnbull, 2014/11/27
- Re: merging emacs-24, Stephen J. Turnbull, 2014/11/27
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Andreas Schwab, 2014/11/28
- Re: merging emacs-24, Eli Zaretskii, 2014/11/28
- Re: merging emacs-24,
Stefan Monnier <=
- Re: merging emacs-24, Glenn Morris, 2014/11/29
- Re: merging emacs-24, Ted Zlatanov, 2014/11/27
- Re: merging emacs-24, Paul Eggert, 2014/11/29
- Re: merging emacs-24, Glenn Morris, 2014/11/29
- Re: generating Chan(was: merging emacs-24), Paul Eggert, 2014/11/29
- Re: merging emacs-24, Eli Zaretskii, 2014/11/27
- Re: merging emacs-24, Glenn Morris, 2014/11/29