comparison: diffutils/diffutils.patch
diffutils/diffutils.patch
- changeset 546
- 7894123eadbf
equal
deleted
inserted
replaced
| -1:000000000000 | 0:a45a4998d699 |
|---|---|
| 1 Index: lib/c-stack.c | |
| 2 --- lib/c-stack.c.orig 2011-08-28 13:55:52.000000000 +0200 | |
| 3 +++ lib/c-stack.c 2012-05-12 10:06:32.000000000 +0200 | |
| 4 @@ -35,6 +35,10 @@ | |
| 5 | |
| 6 #include <config.h> | |
| 7 | |
| 8 +#if defined(__FreeBSD__) | |
| 9 +#include <sys/types.h> | |
| 10 +#endif | |
| 11 + | |
| 12 #ifndef __attribute__ | |
| 13 # if __GNUC__ < 3 | |
| 14 # define __attribute__(x) | |
| 15 Index: man/diff3.1 | |
| 16 --- man/diff3.1.orig 2011-09-02 17:19:12.000000000 +0200 | |
| 17 +++ man/diff3.1 2012-05-12 10:06:32.000000000 +0200 | |
| 18 @@ -39,6 +39,9 @@ | |
| 19 \fB\-a\fR, \fB\-\-text\fR | |
| 20 treat all files as text | |
| 21 .TP | |
| 22 +\fB\-O\fR | |
| 23 +Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only) | |
| 24 +.TP | |
| 25 \fB\-\-strip\-trailing\-cr\fR | |
| 26 strip trailing carriage return on input | |
| 27 .TP | |
| 28 Index: src/diff3.c | |
| 29 --- src/diff3.c.orig 2011-07-03 22:42:54.000000000 +0200 | |
| 30 +++ src/diff3.c 2012-05-12 10:06:32.000000000 +0200 | |
| 31 @@ -158,6 +158,9 @@ | |
| 32 /* If nonzero, show information for DIFF_2ND diffs. */ | |
| 33 static bool show_2nd; | |
| 34 | |
| 35 +/* If nonzero, show information for DIFF_2ND on overlaps, too. */ | |
| 36 +static bool show_2nd_on_overlap; | |
| 37 + | |
| 38 /* If nonzero, include `:wq' at the end of the script | |
| 39 to write out the file being edited. */ | |
| 40 static bool finalwrite; | |
| 41 @@ -237,7 +240,7 @@ | |
| 42 textdomain (PACKAGE); | |
| 43 c_stack_action (0); | |
| 44 | |
| 45 - while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1) | |
| 46 + while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1) | |
| 47 { | |
| 48 switch (c) | |
| 49 { | |
| 50 @@ -272,6 +275,9 @@ | |
| 51 case 'e': | |
| 52 incompat++; | |
| 53 break; | |
| 54 + case 'O': | |
| 55 + show_2nd_on_overlap = true; | |
| 56 + break; | |
| 57 case 'T': | |
| 58 initial_tab = true; | |
| 59 break; | |
| 60 @@ -1547,7 +1553,7 @@ | |
| 61 leading_dot = false; | |
| 62 if (type == DIFF_ALL) | |
| 63 { | |
| 64 - if (show_2nd) | |
| 65 + if (show_2nd || show_2nd_on_overlap) | |
| 66 { | |
| 67 /* Append lines from FILE1. */ | |
| 68 fprintf (outputfile, "||||||| %s\n", file1); | |
| 69 @@ -1686,7 +1692,7 @@ | |
| 70 D_RELLEN (b, mapping[FILE0], i), outputfile); | |
| 71 } | |
| 72 | |
| 73 - if (show_2nd) | |
| 74 + if (show_2nd || show_2nd_on_overlap) | |
| 75 { | |
| 76 /* Put in lines from FILE1 with bracket. */ | |
| 77 fprintf (outputfile, format_2nd, file1); |
