delta/patch.git/patch.man, branch baserock/morph

Refuse to patch read-only files

2010-05-02T10:40:35+00:00

* src/patch.c (main): Refuse to patch read-only files, or at least warn
when patching such files with --force or --batch.
* patch.man: Document the changed behavior.
* tests/read-only-files: Split read-only file test case off from
tests/remember-backup-files.
* tests/Makefile.am: Add new test case.

Document the recent changes

2010-04-23T19:43:45+00:00

* patch.man: Describe the fixed behavior of --set-time and --set-utc
for timestamps that include time zones.
* NEWS: Update.

Clarify the description of the -N option

2010-02-17T15:49:12+00:00

* patch.man: Clarify the description of the -N option.

* patch.man: Clarify the description of the -F / --fuzz option.

2009-12-30T13:54:10+00:00

* patch.man: Try to improve the documentation of patch's CRLF handling

2009-12-29T19:02:50+00:00

behavior.

* src/patch.c (longopts, get_some_switches): Add an optional argument

2009-12-29T16:03:14+00:00

to the --merge option to choose the output formats for conflicts.
* patch.man: Document the new optional argument of --merge.
* src/merge.c (merge_hunk): Implement diff3-style conflicts.
* src/common.h (conflict_style): This global variable determines the
output format for conflicts.
* tests/merge: Add test cases for the diff3 output format.

Fix typo in patch.man (reported by Vytautas Šaltenis)

2009-10-27T15:38:02+00:00

The -m option hasn't been officially allocated yet; use only the long form for now (--merge)

2009-07-19T15:50:54+00:00

Change the default value of PATCH_GET to 0

2009-05-12T12:32:15+00:00

Patch should default to not try to get files from revision control software
unless actively asked by the user with the "-g" or "--get" command-line
switches, or the PATCH_GET environment variable.

Make the posixly correct behaviour of not using source control, the global
patch default. I.e. default to "-g0".

This is related to debian BTS bug: #200895
Please refer to that discussion for more background
information and discussion.

Add support for sending output to standard output

2009-04-08T04:23:11+00:00