incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eric pretorious <epretori...@suddenlink.net>
Subject Re: [PATCH 2/2] Modified license headers in the client directory.
Date Wed, 13 Jun 2012 23:57:08 GMT
On Wed, 2012-06-13 at 07:56 -0400, David Nalley wrote:
> Eric this isn't applying with git-am or git apply -
> 
> See output below:
> 
> Applying: Modified license headers in the client directory.
> error: patch failed: client/.project:1
> ...
> error: patch failed:
client/WEB-INF/classes/resources/messages_es.properties:1
> ...
> error: patch failed:
client/WEB-INF/classes/resources/messages_zh_CN.properties:1
> ...
> error: patch failed:
client/tomcatconf/cisconexusvsm_commands.properties.in:1

David:

I'm not sure about the .project file but those files probably failed to
patch because of encoding and/or mixed line terminators:

> [eric@eric ~]$ cd /usr/local/src/incubator-cloudstack/
> 
> [eric@eric incubator-cloudstack (master)]$ cd
client/WEB-INF/classes/resources/
> 
> [eric@eric resources (master)]$ file *
> messages_es.properties:    UTF-8 Unicode English text, with very long
lines
> messages_ja.properties:    UTF-8 Unicode English text, with very long
lines
> messages_zh_CN.properties: UTF-8 Unicode English text, with very long
lines, with CRLF line terminators
> messages.properties:       ASCII English text, with very long lines
> 
> [eric@eric resources (master)]$
cd /usr/local/src/incubator-cloudstack/
> 
> [eric@eric incubator-cloudstack (master)]$ cd client/tomcatconf/
> 
> [eric@eric tomcatconf (master)]$ file
cisconexusvsm_commands.properties.in 
> cisconexusvsm_commands.properties.in: ASCII English text, with CRLF,
LF line terminators

I'll look into the trailing white space errors (`git diff --check`).
What do you recommend for the UTF-I encoded files and the mixed
line-endings?

Eric Pretorious
Truckee, CA

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message