From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:17:12 +0100 Message-ID: References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <54CE05A0.2090701@cs.ucla.edu> <54CE4FB9.1060800@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422807471 29042 80.91.229.3 (1 Feb 2015 16:17:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:17:51 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:17:51 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 1YHxDZ-0008U6-LH for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:17:49 +0100 Original-Received: from localhost ([::1]:50989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxDY-0001Un-S5 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:17:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxDV-0001Ud-0O for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:17:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHxDP-0004BR-VL for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:17:44 -0500 Original-Received: from mx6.bahnhof.se ([213.80.101.16]:52345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxDP-0004AS-OF for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:17:39 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx6-reinject (Postfix) with ESMTP id 7C5D6418AB; Sun, 1 Feb 2015 17:17:38 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF3) Original-Received: from mf3.bahnhof.se ([127.0.0.1]) by localhost (mf3.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iUXyOFo+E1K6; Sun, 1 Feb 2015 17:17:32 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf3.bahnhof.se (Postfix) with ESMTP id 953003E8CD1; Sun, 1 Feb 2015 17:17:31 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 402BA52B48A; Sun, 1 Feb 2015 16:17:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at verona.se Original-Received: from mta.verona.se ([127.0.0.1]) by localhost (exodia.verona.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZStpoZYDWatM; Sun, 1 Feb 2015 17:17:12 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id C0C6652B485; Sun, 1 Feb 2015 17:17:12 +0100 (CET) In-Reply-To: <54CE4FB9.1060800@yandex.ru> (Dmitry Gutov's message of "Sun, 01 Feb 2015 18:09:29 +0200") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 213.80.101.16 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:182190 Archived-At: Dmitry Gutov writes: > 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). But wouldnt the xwidget branch still be in master then? At this point I would just like to revert all the changes in master. > >> 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. > -- Joakim Verona