Integrating files
To create a new codeline (also called branching)
or propagate a bug fix or new feature from one codeline to another, you
integrate the required files
to the target codeline. To integrate files, you open them for integration,
specifying source and target, and submit the changelist containing the
open files.
If you are integrating changes into an existing codeline, you are required
to resolve the files to ensure that you do not overwrite other users'
changes and to preserve the file's revision history. For details about resolving,
see Resolving files. Typical steps are:
- Open files for integration.
- Submit the changelist. If there are conflicts...
- ...Resolve the files.
When you open files for integration, you can specify the mapping of source to target
using either a file specification or a branch specification.
- File specification: you specify the source and target files when
you open files for integrate.
- Branch specification: you select a branch specification when you
open files for integrate. Branch specifications enable you to predefine source
and target codelines. For details about branch specifications, refer to the
Perforce User's Guide.
To open files for integrate: context-click the file and choose Integrate...
or drag the source file to the target folder. Specify desired integration option
in the Integrate dialog. Integration options are as follows:
- Don't copy target files to client: enable this option if you are
creating a branch in the depot but do not want the corresponding files copied
to your client workspace.
- Enable baseless merges: enable this option if you are integrating
files that have no common revision history with the target codeline or have
a distant common ancestor. Enabling this option searches intermediate files
for indirect history. If there is no common ancestor, the first revision of
the source file is used as the base for merging.