Re: PROPOSAL: Move to git, now that bzr is no longer a req.

[Tassilo Horn]

Bastien <address@hidden> writes:

>> Another question is, whether we still want to write ChangeLogs
>> manually, or whether we want to extract them from commit comments.
>> That's not such easy, see all the "fix typo" comments.
>
> I'm all for writing them manually, it's a useful exercise.

The problem with ChangeLog files is that they provoke conflicts.

When I contribute to some git-using project that has manually written
ChangeLog files, I usually create a new branch, do my changes, write a
ChangeLog entry in a _temporary_ buffer, and then commit providing a
one-line description plus the ChangeLog entries (without the author/date
headline).

Then I sometimes rebase that branch onto master (which works just fine
since the ChangeLog hasn't been changed) until upstream is satisfied
with my changes.  At that point, I put my commit message as real entry
into the ChangeLog, commit, squash the ChangeLog commit with the commit
implementing my changes, and finally push/submit the patch/send the pull
request.

That said, bzr with its changelog_merge plugin is nice, too.  Then you
can make a real, persistent ChangeLog entry along with your commit
implementing the code changes, but once you merge your branch into trunk
you have to remember to pull your entry to the top of the ChangeLog and
re-date it.

Bye,
Tassilo