MoinMoin: attachment:XMLRPCFaultMessageFix.diff of MoinMoinPatch/SyncXMLRPCFaultMessageFix

   1 DIFF(1)                          User Commands                         DIFF(1)
   2 
   3 
   4 
   5 NNAAMMEE
   6        diff - compare files line by line
   7 
   8 SSYYNNOOPPSSIISS
   9        ddiiffff [_O_P_T_I_O_N]... _F_I_L_E_S
  10 
  11 DDEESSCCRRIIPPTTIIOONN
  12        Compare files line by line.
  13 
  14        --ii  ----iiggnnoorree--ccaassee
  15               Ignore case differences in file contents.
  16 
  17        ----iiggnnoorree--ffiillee--nnaammee--ccaassee
  18               Ignore case when comparing file names.
  19 
  20        ----nnoo--iiggnnoorree--ffiillee--nnaammee--ccaassee
  21               Consider case when comparing file names.
  22 
  23        --EE  ----iiggnnoorree--ttaabb--eexxppaannssiioonn
  24               Ignore changes due to tab expansion.
  25 
  26        --bb  ----iiggnnoorree--ssppaaccee--cchhaannggee
  27               Ignore changes in the amount of white space.
  28 
  29        --ww  ----iiggnnoorree--aallll--ssppaaccee
  30               Ignore all white space.
  31 
  32        --BB  ----iiggnnoorree--bbllaannkk--lliinneess
  33               Ignore changes whose lines are all blank.
  34 
  35        --II RE  ----iiggnnoorree--mmaattcchhiinngg--lliinneess=_R_E
  36               Ignore changes whose lines all match RE.
  37 
  38        ----ssttrriipp--ttrraaiilliinngg--ccrr
  39               Strip trailing carriage return on input.
  40 
  41        --aa  ----tteexxtt
  42               Treat all files as text.
  43 
  44        --cc  --CC NUM  ----ccoonntteexxtt[=_N_U_M]
  45               Output NUM (default 3) lines of copied context.
  46 
  47        --uu  --UU NUM  ----uunniiffiieedd[=_N_U_M]
  48               Output NUM (default 3) lines of unified context.
  49 
  50        ----llaabbeell LABEL
  51               Use LABEL instead of file name.
  52 
  53        --pp  ----sshhooww--cc--ffuunnccttiioonn
  54               Show which C function each change is in.
  55 
  56        --FF RE  ----sshhooww--ffuunnccttiioonn--lliinnee=_R_E
  57               Show the most recent line matching RE.
  58 
  59        --qq  ----bbrriieeff
  60               Output only whether files differ.
  61 
  62        --ee  ----eedd
  63               Output an ed script.
  64 
  65        ----nnoorrmmaall
  66               Output a normal diff.
  67 
  68        --nn  ----rrccss
  69               Output an RCS format diff.
  70 
  71        --yy  ----ssiiddee--bbyy--ssiiddee
  72               Output in two columns.
  73 
  74        --WW NUM  ----wwiiddtthh=_N_U_M
  75               Output at most NUM (default 130) print columns.
  76 
  77        ----lleefftt--ccoolluummnn
  78               Output only the left column of common lines.
  79 
  80        ----ssuupppprreessss--ccoommmmoonn--lliinneess
  81               Do not output common lines.
  82 
  83        --DD NAME  ----iiffddeeff=_N_A_M_E
  84               Output merged file to show `#ifdef NAME' diffs.
  85 
  86        ----GGTTYYPPEE--ggrroouupp--ffoorrmmaatt=_G_F_M_T
  87               Similar, but format GTYPE input groups with GFMT.
  88 
  89        ----lliinnee--ffoorrmmaatt=_L_F_M_T
  90               Similar, but format all input lines with LFMT.
  91 
  92        ----LLTTYYPPEE--lliinnee--ffoorrmmaatt=_L_F_M_T
  93               Similar, but format LTYPE input lines with LFMT.
  94 
  95        LTYPE is `old', `new', or `unchanged'.
  96               GTYPE is LTYPE or `changed'.
  97 
  98               GFMT may contain:
  99 
 100        %<     lines from FILE1
 101 
 102        %>     lines from FILE2
 103 
 104        %=     lines common to FILE1 and FILE2
 105 
 106        %[-][WIDTH][.[PREC]]{doxX}LETTER
 107               printf-style spec for LETTER
 108 
 109               LETTERs are as follows for new group, lower case for old group:
 110 
 111        F      first line number
 112 
 113        L      last line number
 114 
 115        N      number of lines = L-F+1
 116 
 117        E      F-1
 118 
 119        M      L+1
 120 
 121               LFMT may contain:
 122 
 123        %L     contents of line
 124 
 125        %l     contents of line, excluding any trailing newline
 126 
 127        %[-][WIDTH][.[PREC]]{doxX}n
 128               printf-style spec for input line number
 129 
 130               Either GFMT or LFMT may contain:
 131 
 132        %%     %
 133 
 134        %c'C'  the single character C
 135 
 136        %c'\OOO'
 137               the character with octal code OOO
 138 
 139        --ll  ----ppaaggiinnaattee
 140               Pass the output through `pr' to paginate it.
 141 
 142        --tt  ----eexxppaanndd--ttaabbss
 143               Expand tabs to spaces in output.
 144 
 145        --TT  ----iinniittiiaall--ttaabb
 146               Make tabs line up by prepending a tab.
 147 
 148        --rr  ----rreeccuurrssiivvee
 149               Recursively compare any subdirectories found.
 150 
 151        --NN  ----nneeww--ffiillee
 152               Treat absent files as empty.
 153 
 154        ----uunniiddiirreeccttiioonnaall--nneeww--ffiillee
 155               Treat absent first files as empty.
 156 
 157        --ss  ----rreeppoorrtt--iiddeennttiiccaall--ffiilleess
 158               Report when two files are the same.
 159 
 160        --xx PAT  ----eexxcclluuddee=_P_A_T
 161               Exclude files that match PAT.
 162 
 163        --XX FILE  ----eexxcclluuddee--ffrroomm=_F_I_L_E
 164               Exclude files that match any pattern in FILE.
 165 
 166        --SS FILE  ----ssttaarrttiinngg--ffiillee=_F_I_L_E
 167               Start with FILE when comparing directories.
 168 
 169        ----ffrroomm--ffiillee=_F_I_L_E_1
 170               Compare FILE1 to all operands.  FILE1 can be a directory.
 171 
 172        ----ttoo--ffiillee=_F_I_L_E_2
 173               Compare all operands to FILE2.  FILE2 can be a directory.
 174 
 175        ----hhoorriizzoonn--lliinneess=_N_U_M
 176               Keep NUM lines of the common prefix and suffix.
 177 
 178        --dd  ----mmiinniimmaall
 179               Try hard to find a smaller set of changes.
 180 
 181        ----ssppeeeedd--llaarrggee--ffiilleess
 182               Assume large files and many scattered small changes.
 183 
 184        --vv  ----vveerrssiioonn
 185               Output version info.
 186 
 187        ----hheellpp Output this help.
 188 
 189        FILES  are  `FILE1  FILE2'  or `DIR1 DIR2' or `DIR FILE...' or `FILE...
 190        DIR'.  If ----ffrroomm--ffiillee or ----ttoo--ffiillee is given, there are no  restrictions
 191        on FILES.  If a FILE is `-', read standard input.
 192 
 193 AAUUTTHHOORR
 194        Written  by  Paul  Eggert, Mike Haertel, David Hayes, Richard Stallman,
 195        and Len Tower.
 196 
 197 RREEPPOORRTTIINNGG BBUUGGSS
 198        Report bugs to <bug-gnu-utils@gnu.org>.
 199 
 200 CCOOPPYYRRIIGGHHTT
 201        Copyright (C) 2002 Free Software Foundation, Inc.
 202 
 203        This program comes with NO WARRANTY, to the extent  permitted  by  law.
 204        You  may redistribute copies of this program under the terms of the GNU
 205        General Public License.  For more information about these matters,  see
 206        the file named COPYING.
 207 
 208 SSEEEE AALLSSOO
 209        The  full documentation for ddiiffff is maintained as a Texinfo manual.  If
 210        the iinnffoo and ddiiffff programs are properly installed  at  your  site,  the
 211        command
 212 
 213               iinnffoo ddiiffff
 214 
 215        should give you access to the complete manual.
 216 
 217 
 218 
 219 diffutils 2.8.1                   April 2002                           DIFF(1)
 220