d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,301 Commits 4 Branches 49 Tags 2 GiB
35d2979599
Commit Graph

20 Commits

Author SHA1 Message Date
ache
2d8b453009 Add PATCH_INDEX_FIRST environment variable to do the same as -I option 1998-01-22 07:44:04 +00:00
ache
cbe4653fb0 Update usage line with new option 1998-01-21 15:15:39 +00:00
ache
3fb81ed571 Add -I or --index-first option to take Index: precedence over context diff, 
as it was in hacked FreeBSD version
 1998-01-21 15:10:14 +00:00
ache
bcf27ec126 Resurrect patch 2.1 without FreeBSD Index: hack 1998-01-21 14:37:27 +00:00
ache
0c8025c02b Upgrade to 2.5 (contrib version) 1998-01-04 21:41:46 +00:00
ache
ec6053240d Back out Index over +++/--- precedence. 
It maybe right, if patch was FreeBSD-own program, but it break compatibility
with pre-existent patches in other systems.
The example is big ncurses patch which don't apply on FreeBSD
due to "fixed" precedence.
 1998-01-03 23:42:56 +00:00
ache
11e6b28c31 Add (unsigned char) cast to ctype macros 1997-10-23 02:44:23 +00:00
jmg
5a9515e418 fix compilation warnings in patch... (with slight modification) 
also remove -Wall that I acidentally committed last time I was here...

Submitted-by: Philippe Charnier

Closes PR#2998
 1997-03-17 01:44:43 +00:00
jmg
fddb79c0af Fix a problem with patch in that is will always default, even when the 
controlling terminal is closed.  Now the function ask() will return 1 when th
input is known to come from a file or terminal, or it will return 0 when ther
was a read error.

Modified the question "Skip patch?" so that on an error from ask it will skip
the patch instead of looping.

Closes PR#777

2.2 candidate
 1997-02-13 21:10:45 +00:00
markm
c6ad12c81b Attempt to break a $Log$ snafu where a *** /--- (minus space) 
was fouling up a comment in the checked-out code.
 1996-04-12 11:37:32 +00:00
markm
414db770b6 Priorities were broken. If there was an Index: line and ***/--- lines 
with valid names, the ***/---names were taken first.
this broke eg:
Index: foo/Makefile
==========
RCS <blah>
Retrieving <blah>
diff <blah>
*** Makefile <blah>
--- Makefile <blah>

By trying to patch the Makefile in the _curent_ directory, rather than
the one in the foo/ directory.
 1996-04-11 10:13:40 +00:00
jdp
df590699c9 Update the manual page to reflect the fact that an "Index" line 
now takes precedence over a context diff header for determining
the name of the file to patch.
 1996-02-07 23:47:55 +00:00
gibbs
4da885ab00 Give "Index" specified filenames preference over other filenames specified 
in the diff.  This makes it so that diffs containing files in different
subdirectories that have the same name not patch the same file.  For example
a diff with patches to Makefile, des/Makefile, usr.bin/Makefile would attempt
to patch Makefile three times.
 1995-09-14 04:33:35 +00:00
rgrimes
2ad6f3dee6 Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
hsu
b5ccaa010d Fix bug that created new files even when running in -C check mode. 
Reviewed by: phk
 1995-01-12 22:09:40 +00:00
phk
17a5179b1d added the -C/-check again. 1994-02-25 21:46:07 +00:00
jkh
6a471bf87c Put this back - I was somehow under the erroneous impression that patch was in 
ports, until I saw the the commit messages, that is! :-)  All changed backed out.
 1994-02-17 22:20:36 +00:00
jkh
98554d2175 From Poul-Henning Kamp - Implement a -C option to verify the integrity of 
a patch before actually applying it.
 1994-02-17 22:16:05 +00:00
rich
79766d4d8d Increaed the fixed static buffer sizes and maximum hunk size that 
otherwise causes the XFree86 1.3 patch set to fail.
 1993-09-22 16:51:03 +00:00
paul
146bcedccd b-maked patch-2.10 1993-06-19 14:21:53 +00:00