tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@gmail.com>
Subject Re: Misconfigured Git-SVN once again
Date Thu, 09 Feb 2012 22:59:23 GMT
2012/2/10 Konstantin Kolinko <knst.kolinko@gmail.com>:
> Hi!
>
> Some recent Mark's commits once again caused several new files to have
> wrong line ends at the server side.
>
> This is a technical issue where the "pristine" texts for the files
> that have svn:eol-style=native property set at the server side have
> CRLF line ends, instead of LFs as required by svn.
>
> The consequence of this can be seen in "r1241441" e-mail where there
> are huge whole-file diffs for simple changes.
>
> To prevent such huge diffs for those files from occurring in the
> future, I am going to fix those files.
>
> My plan is the following:
> 1. Do clean checkout of trunk
> 2. "touch" all the files, i.e. update their timestamp
> 3. Commit.
>
> The essence is that after "touch" the "svn status" command cannot
> treat the files as unmodified but will be forced to compare the actual
> files and their pristine copies. The broken files will be shown as
> modified ones.
>
> The affected files are the following:
>>svn st
> M       trunk\java\org\apache\coyote\http11\upgrade\Constants.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeBioProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeAprProcessor.java
> M       trunk\java\org\apache\coyote\http11\upgrade\UpgradeNioProcessor.java
> M       trunk\webapps\examples\websocket\index.html
>

Fixed in trunk in r1242584.

I've also checked that tc7.0.x does not have this issue.

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message