In MacCVSClient you can view file specific information about CVS controlled files in
info windows. These are
- Diff Windows
- Log Windows
- Conflict Windows
As described in Handling Conflicts,
the conflict windows can be opened for a file, if the last CVS update resulted
in a conflict for that file.
Diff and log windows are available for a file after a CVS diff or CVS log command has
been executed for the file in question. MacCVSClient keeps log and diff data in temp
files as long as possible.
That means that diffs are deleted when the file is
- updated and changes or
- committed (and the repository changes) or
- edited while having MacCVSClient in the background (and switch back to MacCVSClient).
Logs and diffs are deleted when the module window is closed. Logs and diffs can selectively
be deleted using the "File/Forget/Diff" and "File/Forget/Log" functions. Note, that logs and
diffs are not deleted on the CVS server. (How would you delete a diff from a server anyway?)
Only the information temporarily cached by MacCVSClient is deleted.
In diff and conflict windows, "normal" text lines are displayed in grey text. "Special" lines
like conflict markers, diff inserts, and diff removes are displayed in red or black to allow
for easier recognition.
The first and the last of these special lines in a diff or a conflict window are marked with
an 'F' and an 'L' respectively. So, when jumping from special line to special line using COMMAND-[
and COMMAND-], you can easily recognize, whether you're at the end of the interesting section of
the window.
If there is only a single special line, that one is marked with an 'L' and no 'F' is there at all.
In the Preferences dialog you can specify that MacCVSClient
automatically scrolls down to the first special line whenever you open a diff or conflict window.
|