Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets

[Dmitry Gutov]

On 02/01/2015 05:46 PM, address@hidden 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.