CVS Project Commit
With the CVS Project Commit dialog box, you can:
- See the workspace and repository changes of all the files in your project.
- Examine the differences between the most recent changes in the repository, in your workspace, and between the repository and your workspace.
- Have outstanding CVS operations performed on exactly the files you want them to be performed on.
Select Team|CVS Project Commit to see the changes in your active project and to perform outstanding CVS operations automatically. The CVS Project Commit dialog box displays the following page first:
- List Of Changes
- This page displays the current status (changed locally, changed remotely, has conflicts, needs merge, and so on) of all the files in the active project. It allows you to sort the files in ascending or descending order by clicking the heading of the column you want to sort by: Execution, Status, File Name, or Path. In the Execution column, check a file to commit it when you click OK, and uncheck it to leave it uncommitted. All checked files will be committed when you click OK.
Diff pages become available when they apply to the file you select in the List Of Changes page. Select a file whose changes you want to examine, and use the relevant diff page to look at the differences you want to see:
- Diff
- Shows differences between the workspace and repository versions of the file.
- Workspace Diff
- Shows all the changes to the file that you have made in your workspace but have not yet committed to the repository.
- Repository Diff
- Shows the changes in the file that have been committed to the repository.
When you select a diff page, it will show you the first block of difference. Use the diff arrows on the left end of the status bar to move from one block of difference to the next. You can also press Alt + n to move your cursor to the next diff block, or Alt + p to move your cursor to the previous diff block.
The diff pages of the CVS Project Commit dialog are a convenient way to examine merge conflicts. See the "CVS Update (Merge) File" topic in "Team development using JBuilder" to learn how to resolve merge conflicts.