Re: Please, do not use the merged revisions log as the commit message when merging

["Manuel López-Ibáñez" <lopezibanez at gmail dot com>]

2008/8/26 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>:
> [ dropping the gcc list ]
>
> Hello,
>
> * Gerald Pfeifer wrote on Sat, Aug 23, 2008 at 09:17:05PM CEST:
>> On Sun, 17 Aug 2008, Ralf Wildenhues wrote:
>> > It should be on svnwrite.html
>>
>> Something like the following?  (Not committed yet.)
>
> Fine with me, if that's the policy on this matter.
>
> But really there should be a link to the wiki page
> that explains how to maintain branches, if that wiki
> page is so important.  Is it part of gcc.gnu.org/wiki?
> I couldn't find it there with searching.

You better use google to search the wiki. The wiki's own search
doesn't work very well.

http://gcc.gnu.org/wiki/SvnBranch

And I think all this actually comes from using svnmerge.py. The wiki says:

<quote>
To do the actual merge, just run:

 $ svnmerge.py merge

and that's it! It'll merge all the available changes into you working
copy, and let you fix the conflicts, review the changes and do the
commit. As usual, svnmerge-commit-message.txt will be written for you
to use and it will contain also the original logs of the merged
changes.

/!\ svnmerge-commit-message.txt is not an automatically generated,
appropriate commit message and is not intended as the text that should
be inserted verbatim in the svn commit message for the branch merge.
Any GCC Bugzilla PRs in the logs will re-trigger automatic mail
messages, which probably is neither intended nor wanted. You therefore
want to remove the lines which refer to the PR!
</quote>

I still think that we should enable modifying commit messages and we
should put some automatic restrictions in place.

Cheers,

Manuel.