Creating and Applying a Patch
See Also
Patch files enable software developers who are not sharing a common
repository to distribute and integrate changes that have been made to
the code. The IDE enables you to create and apply patches that update copies of source
files so that you do not have to incorporate the changes manually.
To create a patch file of the differences between a locally
modified copy of a file and the repository version:
- Select the file or folder for which you want to create a patch in
the Projects, Files, or Search History window.
- Choose CVS > Export <file_name> Diff
Patch from the main menu.
- Enter a name for the patch file and specify the location where
you want to save the patch.
- Click Export.
A patch file is created in the specified location containing the
differences between the source file versions.
- Note that the Export Diff Patch command is only available on files
and folders which contain local or remote changes
that have not already been merged.
To apply a patch:
- In the Projects, Files, or Favorites window, right-click the file or
folder on which you want to apply the patch and choose Tools > Apply Patch.
- Type the path or navigate to the patch file you want to apply.
- Click Patch.
Notes:
- Because patches on folders use relative paths to the files within
them, folder patches must be applied on the same folder node that the
patch was created on to insure the patch is applied properly.
- If you are uncertain to which file or directory the patch should
be applied, you can find the context information in the patch file itself.
Patch files generated by the IDE contain the context in which the patch
was originally created in the first few lines of the file.
- See Also
- Merging File Revisions from a Branch
- Resolving Merge Conflicts
- Comparing File Revisions in CVS
Legal Notices