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: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 18:09:29 +0200 Message-ID: <54CE4FB9.1060800@yandex.ru> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <54CE05A0.2090701@cs.ucla.edu> 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 1422806996 21560 80.91.229.3 (1 Feb 2015 16:09:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:09:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: joakim@verona.se, Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:09:55 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 1YHx5u-0003C6-JA for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:09:54 +0100 Original-Received: from localhost ([::1]:50950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx5u-0006b5-0M for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:09:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx5e-0006Yc-Sg for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:09:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHx5b-0001FW-N9 for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:09:38 -0500 Original-Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]:52528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx5b-0001Dx-GY for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:09:35 -0500 Original-Received: by mail-we0-f182.google.com with SMTP id l61so34962798wev.13 for ; Sun, 01 Feb 2015 08:09:34 -0800 (PST) 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=A0c+J+N2mMKWOqTn2Qw2n5phgQfgKwUBZcfjIY5Q71Q=; b=tNbT8Nbkl9moL1LFc7Ic+TXO4iJBejCxXPHqrB0ewPaGX5MvulUoai5ITMKNF2rbna ZCQD5YM8yyTCpRgP5bnJk+Y3MIWDfJLk6hxTwAXPfmoWFaid1y81lxFPII84OJv3PEKF xcUtgr7jNniC2JUzBNRFx0nwkc2U8IZOYs0onvY4F/iZC2EB7CcckbdmwgCRBmuOZQoc c2cDZoQhn7Rd/lCofqHGiaPV4NEZOjpMMlo0j72WxSlHlZWyS92OMQo+yuJMI3JOinmb uT9j8tWjM6/NhrIEKJ2LTW8Mz/HUmoJZ6shcBnW6pNj6CZqAGlwt6PbiKF/eiteVh+ON p6wA== X-Received: by 10.180.72.241 with SMTP id g17mr883565wiv.58.1422806974870; Sun, 01 Feb 2015 08:09:34 -0800 (PST) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id ku8sm23849889wjb.23.2015.02.01.08.09.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 08:09:34 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:33.0) Gecko/20100101 Thunderbird/33.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:c03::236 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:182187 Archived-At: On 02/01/2015 05:46 PM, joakim@verona.se wrote: > Ok, so I don't botch it up worse, how would I do the revert exactly? I'd do a history rewrite (check out the last master before the merge), then switch to xwidget, rebase it on top of master, then switch back to master and merge xwidget into it). > Then, how do I squash the commits properly? Just do 'git merge --squash xwidget' in the end. You can amend the resulting commit with ChangeLogs after, since it'll be just one commit. And then do 'git push -f' (!!!). Someone else should make a ruling on this, though, but if we're going to transition on auto-generated ChangeLogs, we probably don't want to have ugly history. Note that you shouldn't do 'git push -f' yourself anyway (and you won't be able to), so just create a rebased, ChangeLog-ged commit in xwidget branching from a2c32b0. > For instance, should all commits to a certain directory be grouped, so a > changelog can be part of the commit message for that directory? As far as I'm concerned, just do one commit. > Is it not possible to edit the changelog to fix it? At smaller scales, it's possible, but you've got a truckload of commits there. If it's not too late, we should try to fix this properly. > Also parts of the patch was written by Gregoire, can I have 2 changelogs > in a commit message? Make it two commits, then, if it's not too much trouble.