Mercurial > hg > xemacs-beta

comparison man/ediff.texi @ 185:3d6bfa290dbd r20-3b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents bfd6434d15b3
children b405438285a2
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
897 used to compare the contents of up to three directories. 897 used to compare the contents of up to three directories.
898 898
899 Session records in session group panels are also marked with @kbd{+}, for 899 Session records in session group panels are also marked with @kbd{+}, for
900 active sessions, and with @kbd{-}, for finished sessions. 900 active sessions, and with @kbd{-}, for finished sessions.
901 901
902 Sometimes, it is convenient to exclude certain session records from a group. 902 Sometimes, it is convenient to exclude certain sessions from a group.
903 Usually this happens when the user doesn't intend to run Ediff of certain 903 Usually this happens when the user doesn't intend to run Ediff of certain
904 files in the group, and the corresponding session records just add clutter 904 files in the group, and the corresponding session records just add clutter
905 to the session group buffer. To help alleviate this problem, the user can 905 to the session group buffer. To help alleviate this problem, the user can
906 type @kbd{h} to mark a session as a candidate for exclusion and @kbd{x} to 906 type @kbd{h} to mark a session as a candidate for exclusion and @kbd{x} to
907 actually hide the marked sessions. There actions are reversible: with a 907 actually hide the marked sessions. There actions are reversible: with a
932 change this variable. 932 change this variable.
933 933
934 @cindex Multi-file patches 934 @cindex Multi-file patches
935 A multi-file patch is a concatenated output of several runs of the Unix 935 A multi-file patch is a concatenated output of several runs of the Unix
936 @file{diff} command (some versions of @file{diff} let you create a 936 @file{diff} command (some versions of @file{diff} let you create a
937 multi-file patch in just one run). In a session group buffer created in 937 multi-file patch in just one run). Ediff facilitates creation of
938 response to @code{ediff-directories} or @code{ediff-directory-revisions}, 938 multi-file patches as follows. If you are in a session group buffer
939 the user can type @kbd{P} to create a multi-file patch of marked sessions 939 created in response to @code{ediff-directories} or
940 (which must be marked using the @kbd{m} command). Ediff then will display 940 @code{ediff-directory-revisions}, you can mark (by typing @kbd{m}) the
941 a buffer containing the patch. In an @code{ediff-directories} session, it 941 desired Ediff sessions and then type @kbd{P} to create a
942 is enough to just mark the requisite sessions. In 942 multi-file patch of those marked sessions.
943 @code{ediff-directory-revisions} revisions, the marked sessions must also 943 Ediff will then display a buffer containing the patch.
944 be active, or else Ediff will refuse to produce a multi-file patch. This is 944 The patch is generated by invoking @file{diff} on all marked individual
945 because, in the latter-style sessions, there are many ways to create diff 945 sessions (represented by files) and session groups (represented by
946 output, and it is easier to handle by running Ediff on the inactive 946 directories). Ediff will also recursively descend into any @emph{unmarked}
947 sessions. 947 session group and will search for marked sessions there. In this way, you
948 can create multi-file patches that span file subtrees that grow out of
949 any given directory.
950
951 In an @code{ediff-directories} session, it is enough to just mark the
952 requisite sessions. In @code{ediff-directory-revisions} revisions, the
953 marked sessions must also be active, or else Ediff will refuse to produce a
954 multi-file patch. This is because, in the latter-style sessions, there are
955 many ways to create diff output, and it is easier to handle by running
956 Ediff on the inactive sessions.
948 957
949 Last, but not least, by typing @kbd{=}, you can quickly find out which 958 Last, but not least, by typing @kbd{=}, you can quickly find out which
950 sessions have identical files, so you won't have to run Ediff on those 959 sessions have identical files, so you won't have to run Ediff on those
951 sessions. This, however, works only on local, uncompressed files. 960 sessions. This, however, works only on local, uncompressed files.
952 For compressed or local files, this command won't report anything. 961 For compressed or local files, this command won't report anything.