Daniel Shahaf wrote:
> Blair Zajac wrote on Tue, 10 Jun 2008 at 09:39 -0700:
>> danielsh_at_tigris.org wrote:
>>> Author: danielsh
>>> Date: Tue Jun 10 09:35:53 2008
>>> New Revision: 31684
>>>
>>> Log:
>>> Merge r31673 from trunk.
>> This commit is much larger then the one line change in r31673. Is the log
>> message incorrect or the merge, if the later, should probably revert the whole
>> commit and redo it.
>>
>
> EOL style differences, I think. I ran 'svn diff' before I committed and
> it looked fine...
The diff email looks confused, it's got unrelated changes printed, such as
CHANGES just following a line for hooks.c:
Modified: branches/1.5.x/subversion/libsvn_repos/hooks.c
URL:
http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/libsvn_repos/hooks.c?pathrev=31684&r1=31683&r2=31684
==============================================================================
--- branches/1.5.x/subversion/libsvn_repos/hooks.c Tue Jun 10 09:33:54 2008 (r31683)
+++ branches/1.5.x/subversion/libsvn_repos/hooks.c Tue Jun 10 09:35:53 2008 (r31684)
@@ -1,2893 +1,911 @@
-Version 1.5.0
-(17 Jun 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.0
The commit is fine, just the email is wonked.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-10 18:50:25 CEST