From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: namespace convention for short-lived branches Date: Thu, 23 Apr 2015 04:03:56 +0300 Message-ID: <553844FC.2050703@yandex.ru> References: <1y4lmdb5r.fsf@fencepost.gnu.org> <5535562D.5050808@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1429751087 2220 80.91.229.3 (23 Apr 2015 01:04:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Apr 2015 01:04:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 23 03:04:40 2015 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 1Yl5ZI-00025p-9M for ged-emacs-devel@m.gmane.org; Thu, 23 Apr 2015 03:04:40 +0200 Original-Received: from localhost ([::1]:37600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl5ZH-0002jo-Kw for ged-emacs-devel@m.gmane.org; Wed, 22 Apr 2015 21:04:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl5Z4-0002jf-Fx for emacs-devel@gnu.org; Wed, 22 Apr 2015 21:04:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl5Yx-00056q-Hk for emacs-devel@gnu.org; Wed, 22 Apr 2015 21:04:26 -0400 Original-Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:37911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl5Yx-0004ze-AT; Wed, 22 Apr 2015 21:04:19 -0400 Original-Received: by wiun10 with SMTP id n10so75763739wiu.1; Wed, 22 Apr 2015 18:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=ysLQTBkTAvVmGJknlTWMzjjkLq6FJRpPvNuIoEKmY+w=; b=xRk0lNS4Uim/NcG7ijG0M+aEawE44kuCFj/70RLb9griHb+YeFvcUJtO2dpi6LMxIP ooBD5s/J9UPRAE/iYYXgJj7TBjoBXueIIDRq1GY56tfJog0p2TCJF7IYx1GHFhgt0aw7 uEENnx+hjDOK2asqjevITKVy6/Z9LvXI98oD1My9hvOCvGanGtfTeNZkDZCEdYqIl6G0 XjBTrMNOzZP8oFObTRUUQHRoTyHMOD7zsH5qK7OJ9t+ZrrgY5t2kkAujEoUeY6/INF4G HcZX0Fz1q5s2OOPDqo9Xztarrq4SzgtSQLJTzI+YScNdhPATcSz1MCr22Bsi1f/DEnAb N8sg== X-Received: by 10.180.73.180 with SMTP id m20mr1263198wiv.2.1429751039259; Wed, 22 Apr 2015 18:03:59 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id bx3sm9588620wjc.21.2015.04.22.18.03.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Apr 2015 18:03:58 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::235 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:185793 Archived-At: On 04/22/2015 08:56 PM, Glenn Morris wrote: > You can verify this by looking at the mails that come about when > emacs-24 is merged to trunk, eg: > > http://lists.gnu.org/archive/html/emacs-diffs/2015-03/msg00037.html > > There have been no complaints so far. Like I thought, it's only showing the new commits (the merge commits in this case, both the "meaty" and "skipping" ones). While it seems like the emails contain all the changes (squished together, which might appeal to people used to Bazaar's merges), you don't see the merged commits' messages (only their first lines). And while in merges from emacs-24 you see the ChangeLog changes now, as soon as they're auto-generated there too, that will change. I'm not sure we want to include the full message of each commit inside the merge commit's message (which would be a way to fix that). > At the risk of opening the chat-about-git-floodgates again, this prompts > me to ask: is there a setting that will make such merge mails better? > I'm using > > log --format=full -C --stat -p -m --first-parent > > I'm a simple-minded person who just wants to see > "difference between master before this change was applied and after it > was applied" Yup, it seems you're already aware of what I described above. > Sometimes the diffs don't seem to make sense. Eg in > > http://lists.gnu.org/archive/html/emacs-diffs/2015-03/msg00040.html > > The NEWS diff is completely bogus AFAICS (the NEWS file in emacs-24 > merges to NEWS.24 in trunk). I believe that some of the edits there were done by hand, to resolve the conflicts. And some of NEWS entries were moved to NEWS.24 in a later merge commit, 98284ef. So it seems correct.