|
| From: | Paul Eggert |
| Subject: | Re: Missing changes in merges from emacs-25 to master |
| Date: | Tue, 22 Mar 2016 11:32:12 -0700 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
On 03/22/2016 09:30 AM, Stefan Monnier wrote:
We should probably remove "merge" from bzrmerge-skip-regexp (and use "backport" as the main magic keyword) or at least refine it to only match things like "don't merge".
I tried gitmerge.el unchanged, found a similar bug with the proposed merge, removed "merge" from gitmerge-skip-regexp, redid the merge and found that it worked better this time, and committed the result into the master.
The whole gitmerge.el business is still odd, though. What's up with merge commits like f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd whose commit message is merely "-"?
Plus, ChangeLog generation is still broken in master. I'm becoming more inclined to install into master the patch I proposed in <http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00391.html>. Although this patch is merely a stopgap measure until someone figures out a better way to edit commit messages, it's clearly better than what we have now in 'master'.
| [Prev in Thread] | Current Thread | [Next in Thread] |