From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 08:02:12 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <878uiw7q5n.fsf@lifelogs.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417093334 6597 80.91.229.3 (27 Nov 2014 13:02:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 13:02:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 14:02:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xtyhz-00074s-25 for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 14:02:07 +0100 Original-Received: from localhost ([::1]:39433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtyhy-00070S-6a for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 08:02:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtyhn-0006qz-Ke for emacs-devel@gnu.org; Thu, 27 Nov 2014 08:02:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtyhf-0000aR-T6 for emacs-devel@gnu.org; Thu, 27 Nov 2014 08:01:55 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtyhf-0000a6-N9 for emacs-devel@gnu.org; Thu, 27 Nov 2014 08:01:47 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xtyhc-0006wd-9b for emacs-devel@gnu.org; Thu, 27 Nov 2014 14:01:44 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Nov 2014 14:01:44 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Nov 2014 14:01:44 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 60 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:QYdhd8KO5qT2EBXj0EPOEHtH7x8= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178354 Archived-At: On Wed, 26 Nov 2014 22:48:12 -0500 Glenn Morris wrote: GM> The ChangeLogs don't look right. All merged new entries should have gone GM> to the top (this was trivial with bzr's changelog-merge plugin, probably GM> git has something similar) and got today's date. I used the recommended gnulib driver: [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B GM> Also, the ChangeLogs for the changes marked "backport" (etc, check for GM> any commit that matches bzrmerge-skip-regexp) have all been merged back GM> to trunk, leading to duplicate entries. The new ones should all be GM> removed. This is part of what bzrmerge.el handled. I don't think Git merges can work that way, though. They bring in the whole branch, you can't exclude some commits. You have to either cherry-pick the ones you want instead of merging, or revert the ones you don't want after merging. GM> BTW: with bzr, the logs for the merged changes would be visible with GM> bzr log -n0 GM> How does one do that with git log? You do it to the two branches that were merged. So e.g. commit ba4502fe1465f7803beca3ae187e41f0b25bef10 Merge: b121ef1 81e0cca Author: Ted Zlatanov Date: Wed Nov 26 21:31:11 2014 -0500 Merge branch 'emacs-24' means you do `git log b121ef1..81e0cca' On Thu, 27 Nov 2014 11:45:14 +0100 Andreas Schwab wrote: AS> Glenn Morris writes: >> More worryingly, some commits appear to be missing? AS> They are yet to be merged. The merge commit merged a 10 day old branch. AS> Try "git show-branch origin/master origin/emacs-24". I can't believe I did that. Sorry. It's not harmful, but I was careless. I've now added this alias to my gitconfig: [alias] pull-all = !"old=$(git rev-parse --abbrev-ref HEAD) ; for b in $(git for-each-ref refs/heads --format='%(refname)') ; do git checkout ${b#refs/heads/} ; git pull --ff-only ; done; git checkout ${old}" I can revert my merge commit for the reasons Andreas and Glenn listed, or it can be patched up. Reverting is probably better to keep the ChangeLogs clean. Let me know, or go ahead and revert directly (it will have a few conflicts, nothing too bad). Ted