comparison etc/BETA @ 223:2c611d1463a6 r20-4b10

Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents 41ff10fd062f
children 0e522484dd2a
comparison
equal deleted inserted replaced
222:aae4c8b01452 223:2c611d1463a6
188 of the developers. 188 of the developers.
189 189
190 ** Creating patches for submission 190 ** Creating patches for submission
191 ================================== 191 ==================================
192 192
193 When making patches you should use the `-c' option, or preferably, if 193 When making patches please use the `-u' option, or if your diff
194 your diff supports it, `-u'. Using ordinary (context-free) diffs are 194 doesn't support it, `-c'. Using ordinary (context-free) diffs are
195 notoriously prone to error, since line numbers tend to change when 195 notoriously prone to error, since line numbers tend to change when
196 others make changes to the same source file. 196 others make changes to the same source file.
197 197
198 $ diff -u old-file.c new-file.c 198 $ diff -u old-file.c new-file.c
199 199
207 $ cp -p lwlib/xlwmenu.c lwlib/xlwmenu.c.orig 207 $ cp -p lwlib/xlwmenu.c lwlib/xlwmenu.c.orig
208 hack, hack, hack.... 208 hack, hack, hack....
209 $ diff -u lwlib/xlwmenu.c.orig lwlib/xlwmenu.c 209 $ diff -u lwlib/xlwmenu.c.orig lwlib/xlwmenu.c
210 210
211 It is preferrable for patches to be accompanied by an update (raw 211 It is preferrable for patches to be accompanied by an update (raw
212 entry preferred) to the appropriate ChangeLog file. 212 entry preferred) to the appropriate ChangeLog file. Patches to
213 ChangeLog files have an extremely high rate of failure.
213 214
214 Also note that if you cut & paste from an xterm to an XEmacs mail buffer 215 Also note that if you cut & paste from an xterm to an XEmacs mail buffer
215 you will probably lose due to tab expansion. The best thing to do is 216 you will probably lose due to tab expansion. The best thing to do is
216 to use an XEmacs shell buffer to run the diff commands, or ... 217 to use an XEmacs shell buffer to run the diff commands, or ...
217 M-x cd to the appropriate directory, and issue the command `C-u M-!' from 218 M-x cd to the appropriate directory, and issue the command `C-u M-!' from