# # patch "ChangeLog" # from [82f8ca03bb8bebf71c86d23e495b8de4ea0b1afc] # to [609dad8e85bd29d73185f3fc0fa025f8a3fa6f5e] # # patch "monotone.texi" # from [182448f115ae70d11d3e594e4c88aae731577213] # to [82e309cffe8832da1e871c00c9795af49531f1df] # --- ChangeLog +++ ChangeLog @@ -1,3 +1,8 @@ +2005-04-14 Derek Scherger + + * monotone.texi (Informative): update description of 'diff' with + two revision arguments + 2005-04-14 Matthew Gregan * win32/process.cc: Fix build on MingW 3.2.0-rc[123] by adding --- monotone.texi +++ monotone.texi @@ -3526,9 +3526,7 @@ differences between the revision @var{id} and the current revision in the working copy. With two @option{--revision} options @command{diff} will print the differences between revisions @var{id1} and @var{id2}, -ignoring any working copy. Note that no @var{pathname...} arguments may -be specified to restrict the diff output in this case. Restrictions may -only be applied to the current, in-progress, working copy revision. +ignoring any working copy. In all cases, monotone will print a textual summary -- identical to the summary presented by @command{monotone status} -- of the logical @@ -3537,8 +3535,8 @@ a program processing the diff, such as @command{patch}. Specifying pathnames to the @command{diff} command restricts the set of -changes that are visible and results in only a partial diff of the -working copy. Changes to files not included in the specified set of +changes that are visible and results in only a partial diff between +two revisions. Changes to files not included in the specified set of pathnames will be ignored. From within a subdirectory of the working copy the @command{diff}