Mercurial > hg > xemacs-beta

comparison man/ediff.texi @ 187:b405438285a2 r20-3b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b20
author cvs
date Mon, 13 Aug 2007 09:56:28 +0200
parents 3d6bfa290dbd
children acd284d43ca1
comparison
equal deleted inserted replaced
186:24ac94803b48 187:b405438285a2
201 a file under version control. 201 a file under version control.
202 202
203 @item ediff-patch-file 203 @item ediff-patch-file
204 @itemx epatch 204 @itemx epatch
205 @findex ediff-patch-file 205 @findex ediff-patch-file
206 @findex epatch 206 @findex epatch
207 Patch a file, then compare. 207
208 Patch a file or multiple files, then compare. If the patch applies to just
209 one file, Ediff will invoke a regular comparison session. If it is a
210 multi-file patch, then a session group interface will be used and the user
211 will be able to patch the files selectively. @xref{Session Groups}, for
212 more details.
213
214 Note that @code{ediff-patch-file} will actually use the @file{patch}
215 utility to change the the original files on disk. This is not that
216 dangerous, since you will always have the original contents of the file
217 saved in another file that has the extension @file{.orig}.
218 Furthermore, if the file is under version control, then you can always back
219 out to one of the previous versions (see the section on Version Countrol in
220 Emacs manual).
221
222 @code{ediff-patch-file} is careful about versions control: if the file
223 to be patched is checked in, then Ediff will offer to check it out, because
224 failing to do so may result in the loss of the changes when the file is
225 checked out the next time.
226
227 If you don't intend to modify the file via the patch and just want to see
228 what the patch is all about (and decide later), then
229 @code{ediff-patch-buffer} might be a better choice.
230
208 @item ediff-patch-buffer 231 @item ediff-patch-buffer
209 @itemx epatch-buffer 232 @itemx epatch-buffer
210 @findex ediff-patch-buffer 233 @findex ediff-patch-buffer
211 Patch a buffer, then compare. 234 @findex epatch-buffer
235 Patch a buffer, then compare. The buffer being patched and the file visited
236 by that buffer (if any) is @emph{not} modified. The result of the patch
237 appears in some other buffer that has the name ending with @emph{_patched}.
238
239 This function would refuse to apply a multifile patch to a buffer. Use
240 @code{ediff-patch-file} for that (and when you want the original file to be
241 modified by the @file{patch} utility).
212 242
213 @item ediff-merge-files 243 @item ediff-merge-files
214 @itemx ediff-merge 244 @itemx ediff-merge
215 @findex ediff-merge-files 245 @findex ediff-merge-files
216 @findex ediff-merge 246 @findex ediff-merge
321 To compare large regions, use @code{ediff-regions-linewise}. This 351 To compare large regions, use @code{ediff-regions-linewise}. This
322 command displays differences much like @code{ediff-files} and 352 command displays differences much like @code{ediff-files} and
323 @code{ediff-buffers}. 353 @code{ediff-buffers}.
324 354
325 The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a 355 The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a
326 patch to a file or a buffer and then run Ediff on these buffers, displaying 356 patch to a file or a buffer and then run Ediff on the appropriate
327 the difference regions. 357 files/buffers, displaying the difference regions.
328 358
329 The entry points @code{ediff-directories}, @code{ediff-merge-directories}, 359 The entry points @code{ediff-directories}, @code{ediff-merge-directories},
330 etc., provide a convenient interface for comparing and merging files in 360 etc., provide a convenient interface for comparing and merging files in
331 different directories. The user is presented with Dired-like interface from 361 different directories. The user is presented with Dired-like interface from
332 which one can run a group of related Ediff sessions. 362 which one can run a group of related Ediff sessions.
2223 David Petchey (petchey_david@@jpmorgan.com), 2253 David Petchey (petchey_david@@jpmorgan.com),
2224 Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk), 2254 Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk),
2225 Tibor Polgar (tlp00@@spg.amdahl.com), 2255 Tibor Polgar (tlp00@@spg.amdahl.com),
2226 David Prince (dave0d@@fegs.co.uk), 2256 David Prince (dave0d@@fegs.co.uk),
2227 Paul Raines (raines@@slac.stanford.edu), 2257 Paul Raines (raines@@slac.stanford.edu),
2258 Bill Richter (richter@@math.nwu.edu),
2228 C.S. Roberson (roberson@@aur.alcatel.com), 2259 C.S. Roberson (roberson@@aur.alcatel.com),
2229 Kevin Rodgers (kevin.rodgers@@ihs.com), 2260 Kevin Rodgers (kevin.rodgers@@ihs.com),
2230 Sandy Rutherford (sandy@@ibm550.sissa.it), 2261 Sandy Rutherford (sandy@@ibm550.sissa.it),
2231 Heribert Schuetz (schuetz@@ecrc.de), 2262 Heribert Schuetz (schuetz@@ecrc.de),
2232 Andy Scott (ascott@@pcocd2.intel.com), 2263 Andy Scott (ascott@@pcocd2.intel.com),