On 17/06/11 09:49, Cédric Villemain wrote:
>
> I have issues applying it.
> Please can you remove trailing space?
> Also, you can generate a cool patch like this :
>
> get git-external-diff from postgres/src/tools to /usr/lib/git-core/
> chmod +x it
> export GIT_EXTERNAL_DIFF=git-external-diff
> git format-patch --ext-diff origin
>
>
> my log:
> $ git apply temp-files-v5.patch
> temp-files-v5.patch:22: trailing whitespace.
> defaults to unlimited (<literal>-1</>). Values larger than zero
> temp-files-v5.patch:23: trailing whitespace.
> constraint the temporary file space usage to be that number of
> temp-files-v5.patch:28: trailing whitespace.
> the total space used by all the files produced by one backend is
> temp-files-v5.patch:35: trailing whitespace.
> constrain disk space used for temporary table storage. However if
> temp-files-v5.patch:105: trailing whitespace.
> /*
> error: patch failed: src/backend/storage/file/fd.c:132
> error: src/backend/storage/file/fd.c: patch does not apply
> error: src/test/regress/expected/resource.out: No such file or directory
> error: src/test/regress/sql/resource.sql: No such file or directory
>
I can generate a patch that way no problem - however it does not apply
using the above method:
$ git apply /data0/download/postgres/patches/temp/temp-files-v5.1.patch
error: doc/src/sgml/config.sgml: already exists in working directory
error: src/backend/storage/file/fd.c: already exists in working directory
error: src/backend/utils/misc/guc.c: already exists in working directory
error: src/backend/utils/misc/postgresql.conf.sample: already exists in
working directory
error: src/include/utils/guc.h: already exists in working directory
error: src/include/utils/guc_tables.h: already exists in working directory
error: src/test/regress/serial_schedule: already exists in working directory
However it applies just fine using the "normal" method:
$ patch --dry-run -p1 <
/data0/download/postgres/patches/temp/temp-files-v5.1.patch
patching file doc/src/sgml/config.sgml
patching file src/backend/storage/file/fd.c
patching file src/backend/utils/misc/guc.c
patching file src/backend/utils/misc/postgresql.conf.sample
patching file src/include/utils/guc.h
patching file src/include/utils/guc_tables.h
patching file src/test/regress/expected/resource.out
patching file src/test/regress/serial_schedule
patching file src/test/regress/sql/resource.sql
Any idea?
regards
Mark