On 08.01.2016 16:41, Dave Page wrote:
>
> I get the following rejects (see attached as well). I wonder if it's a
> line ending issue - what platform are you working on?
>
> piranha:pgadmin3 dpage$ git apply --reject ~/Downloads/gp-doc.diff
> /Users/dpage/Downloads/gp-doc.diff:9: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
> /Users/dpage/Downloads/gp-doc.diff:10: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
> /Users/dpage/Downloads/gp-doc.diff:18: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
> /Users/dpage/Downloads/gp-doc.diff:19: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
> /Users/dpage/Downloads/gp-doc.diff:27: trailing whitespace.
> path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
This complains about trailing whitespaces where I can't see any
whitespaces in my diff. Not sure why ...
Attached is an updated version of the diff, plus one with Mac line endings.
Regards,
--
Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project