FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F12.2 2019-12-03T18:55:09Z 2019-12-03T18:55:09Z Kyle Evans kevans@FreeBSD.org 2019-12-03T18:55:09Z urn:sha1:be3a0c5043ce6f6dd57ad55276e9b67447be6867 r351836: patch(1): add some basic tests Summary: - basic: test application of patches created by diff -u at the beginning/middle/end of file, which have differing amounts of context before and after chunks being added - limited_ctx: stems from PR 74127 in which a rogue line was getting added when the patch should have been rejected. Similar behavior was reproducible with larger contexts near the beginning/end of a file. See r326084 for details - file_creation: patch sourced from /dev/null should create the file - file_nodupe: said patch sourced from /dev/null shouldn't dupe the contents when re-applied (personal vendetta, WIP, see comment) - file_removal: this follows from nodupe; the reverse of a patch sourced from /dev/null is most naturally deleting the file, as is expected based on GNU patch behavior (WIP) r351866: patch(1): fix the file removal test, strengthen it a bit To remain compatible with GNU patch, we should ensure that once we're removing empty files after a reversed /dev/null patch we don't remove files that have been modified. GNU patch leaves these intact and just reverses the hunk that created the file, effectively implying --remove-empty-files for reversed /dev/null patches. r354328: patch(1): give /dev/null patches special treatment We have a bad habit of duplicating contents of files that are sourced from /dev/null and applied more than once... take the more sane (in most ways) GNU route and complain if the file exists and offer reversal options. This still falls short a little bit as selecting "don't reverse, apply anyway" will still give you duplicated file contents. There's probably other issues as well, but awareness is the first step to happiness. 2015-08-15T00:42:33Z Xin LI delphij@FreeBSD.org 2015-08-15T00:42:33Z urn:sha1:e678759c309d8840ca620c77e6a6668b704c3220 Obtained from: DragonFly via OpenBSD Relnotes: yes MFC: never 2015-07-21T22:57:27Z Conrad Meyer cem@FreeBSD.org 2015-07-21T22:57:27Z urn:sha1:300ca9a86e0642c9f9285ace20fbb7f4d2695ba8 Differential Revision: https://reviews.freebsd.org/D3146 Reviewed by: pfg Approved by: markj (mentor) MFC after: 1 week Relnotes: yes Sponsored by: EMC / Isilon Storage Division 2014-06-15T16:38:17Z Pedro F. Giffuni pfg@FreeBSD.org 2014-06-15T16:38:17Z urn:sha1:5e64d66ca4365c2a3ebc22a9fd4a333876d8e29a Other implementations of patch(1), including GNU patch and "svn patch" have a --dry-run option which does the same as our -C or --check option. Add a new alias to make our implementation more compatible. MFC after: 1 week 2014-06-12T19:01:57Z Pedro F. Giffuni pfg@FreeBSD.org 2014-06-12T19:01:57Z urn:sha1:9f00ccd37adf049f01d6d72c210a0abcbc51077c This change reverts a change from OpenBSD which made use of calloc, and therefore wasted time initializing arrays that will later be realloc'ed. Consistently use FreeBSD's reallocf(). While here also merge the changes from OpenBSD's manpage patch.1 Rev 1.27: "patch was moved from user portability (UP) to base in issue 7 and is no longer optional" MFC after: 1 week 2013-04-11T18:46:41Z Joel Dahl joel@FreeBSD.org 2013-04-11T18:46:41Z urn:sha1:b1edef175b19fca88a3962b63cdaa4a46fed87a5 2013-01-29T20:05:16Z Xin LI delphij@FreeBSD.org 2013-01-29T20:05:16Z urn:sha1:e56ef7d3586d1dea57990c7d94e260b54423ffc3 - Remove $DragonFly$ tags as they are using git nowadays and VCS tags will not help merging. - Other changes to Copyright headers to make them consistent with other source code, we intend to fork from this point. Reviewed by: pfg 2013-01-29T17:03:18Z Gabor Kovesdan gabor@FreeBSD.org 2013-01-29T17:03:18Z urn:sha1:2dd076b84bb1129d0a62b886a4e736a9344b3376 DragonflyBSD and install it as bsdpatch. WITH_BSD_PATCH makes it default and installs GNU patch as gnupatch. Submitted by: pfg Obtained from: The DragonflyBSD Project 1997-07-13T14:26:00Z Peter Wemm peter@FreeBSD.org 1997-07-13T14:26:00Z urn:sha1:65b3003d2db57c7e7f521f5f091ed7adbc151768 1997-07-06T06:54:14Z Bruce Evans bde@FreeBSD.org 1997-07-06T06:54:14Z urn:sha1:c44252b6e8da46f58fd1882b9e7305a0f9114c16 pascal and vmstat.sparc. All changed files on the vendor branch should already have been imported.