src/usr.bin/diff3/tests, branch releng/14.2FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F14.22023-08-16T17:55:03ZRemove $FreeBSD$: one-line sh pattern2023-08-16T17:55:03ZWarner Loshimp@FreeBSD.org2023-08-16T17:55:03Zurn:sha1:d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
diff3: Remove test case that references non existent test files2022-05-02T15:00:44ZTom Jonesthj@FreeBSD.org2022-05-02T15:00:44Zurn:sha1:c1c381eb7f82ecfec24b56c96c216dd160f2e3ea
Sponsored by: Klara, Inc.
diff3: Add support for -m2022-04-19T15:20:24ZTom Jonesthj@FreeBSD.org2022-04-19T15:20:24Zurn:sha1:034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3
diff3 in -m mode generates a complete file with changes bracketed with
conflict markers. This adds support for diff3 to generate version
control style three way merge output.
The output format was inferred from looking at the gnu diff3 output on a
selection of test files as a specification of what diff3 -m should
output is not available. It is likely there are cases where the -m
output differs from other tools and I am happy to update diff3 to
address these.
Discussed with: pstef, kevans
Sponsored by: Klara, Inc.
diff3: Add support for -A2022-04-19T14:54:32ZTom Jonesthj@FreeBSD.org2022-04-19T14:43:35Zurn:sha1:9ab079c5e81098c81e8b25f26a3b56392eac5463
Diff3 in -A mode generates an ed script to show how the 3 files and
brackets changes that conflict. The ed script generated should when
applied leave familiar merge conflict markers in a patched file.
Diff3 output is not documented, this feature has been arrived at by
comparing bsd diff3 output to gnu diff3 output until they were made to
agree. There are likely to still be differences between these formats.
The gnu diff3 guide is actually quite good at explaining how diff3
output should appear, but it doesn't cover every form of output from
diff3.
https://www.gnu.org/software/diffutils/manual/diffutils.html#Comparing-Three-Files
Discussed with: pstef, kevans
Sponsored by: Klara, Inc.
diff3: allow diff3 ed scripts to generate deletions2022-04-15T14:00:59ZTom Jonesthj@FreeBSD.org2022-04-15T13:59:14Zurn:sha1:7c03df6855f451749501748b98019c8e2d9d9600
diff3 with the -e (ed script flag) can generate line deletions, add
support for deletions and add a test case to exercise this behaviour.
This functionality was unearthed through comparison of bsd diff3 and gnu
diff3 output.
Reviewed by: pstef
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D34912
diff3: document and test -T2021-08-25T16:20:59ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-23T19:33:27Zurn:sha1:9f7a81b133c715f649136dcd0ad004e4180c56c9
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31650
diff3: implement --strip-trailing-cr2021-08-23T05:04:28ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-21T00:28:58Zurn:sha1:54a3415cb69e1ea0e6533ca3fc168deba64f249f
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31626
DIRDEPS_BUILD: Connect new directories.2017-10-31T00:04:07ZBryan Drewerybdrewery@FreeBSD.org2017-10-31T00:04:07Zurn:sha1:3806950135d2c8633ec0764e8807eacc87cf3e10
Sponsored by: Dell EMC Isilon
For now comment tests for arguments which are not in par with GNU diff3 yet2017-05-25T17:58:01ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:58:01Zurn:sha1:cb5a670ececeae05a9c1e90a56f71b4219342ef5Import working progress BSD diff32017-05-25T17:45:50ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:45:50Zurn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f
import bsd diff3 from OpenBSD.
Differences with OpenBSD:
- lots of warning fixed
- no shell wrapper with diff3 actually living in libexec
- capsicumized
Keep it disconnected as it is not yet good enough to replace GNU diff
The motivation to import it now it to allow other people to jump in and also to
have an open development on it
Obtained from: OpenBSD