This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] limit commit message to 500 lines (was: Please, do not use the merged revisions log as the commit message when merging)
svnmerge has a command line option not to generate those messages.
We don't control the source to svnmerge.
On Tue, Aug 26, 2008 at 1:31 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Aug 26, 2008 at 9:46 AM, Manuel López-Ibáñez
> <lopezibanez@gmail.com> wrote:
>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>> On Tue, Aug 26, 2008 at 9:19 AM, Manuel López-Ibáñez
>>> <lopezibanez@gmail.com> wrote:
>>>> 2008/8/26 H.J. Lu <hjl.tools@gmail.com>:
>>>>>
>>>>> When I add 600 testcases, should I mention each of them in commit log?
>>>>
>>>> 500 was just a number. That said, you could very well do 2 commits of
>>>> 300 testcases.
>>>>
>>>
>>> It will be very odd. I believe some libjava merges updated more than 500
>>> files. If we have to break such checkins into several smaller ones just
>>> because svnmerge can't handle it properly, maybe we should ban
>>> svnmerge instead.
>>>
>>> FWIW, I don't use svnmerge and I never have any problems to
>>> merge between branches with "svn merge".
>>>
>>
>> H.J.,
>>
>> I think you are misunderstanding the problem that this patch is trying to solve.
>>
>> If you do: svn ci -F file
>> subversion will use the contents of 'file' as the commit log that you
>> later can check with 'svn log'.
>> After a merge but before committing svnmerge generates a file with the
>> 'svn log' output of all revisions merged. If you use this file as the
>> commit log, then you (a) make harder to read the output of 'svn log'
>> (b) flood the gcc.gnu.org servers that are parsing your commit log for
>> PR numbers and sending emails to bugzilla and subscribers. The emails
>> are the commit logs, so they are typically a very long email with
>> multiple commits that has no relevance to the receiver.
>
> Can we modify svnmerge to generate an output which will be ignored
> by "svn ci"? Will "svn ci" ignore lines after
>
> --This line, and those below, will be ignored--
>
> if svnmerge puts it at the beginning of its output?
>
> --
> H.J.
>