si resynccp
merges change package members to a Windchill RV&S sandbox
Synopsis
si resynccp [--allowOpenCP] [--[no]alreadyInProjectIsError] [--backFill=[cp|revision|error|skip|ask]] [--mergeType=[confirm|cancel|automatic|manual]] [--onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error]] [--[no]confirm] [--notify=[never|onCompletion|onError]] [--[no]ignoreBranches] [--[no]ignoreServer] [--[no]continueOnErrors] [--[no|confirm]merge] [--[no|confirm]mergeOnBranch] [--[no]failOnAmbiguousProject] [--[no|confirm]createVariants] [--[no]otherProjectIsError] [--changePackageID=value] [--cpid=ID] [(--issueID=value)] [--[no]spanProjects] [--[no]useMaster] [--[no]verbose] [(-S sandbox|--sandbox=sandbox)] [--hostname=server] [--port=number] [--password=password] [--user=name] [(-?|--usage)] [(-F file|--selectionFile=file)] [(-N|--no)] [(-Y|--yes)] [--[no]batch] [--cwd=directory] [--forceConfirm=[yes|no]] [(-g|--gui)] [--quiet] [--settingsUI=[gui|default]] [--status=[none|gui|default]] [--[no]ignoreUpdateRevision] [--subprojectPropagation=[explicit|implicit]] [--[no|confirm]resyncIfOutOfScope] issue|issue:change package id...
Description
si resynccp allows you to preview the changes listed in change packages in the context of a sandbox before you propagate them to the project. This command searches all files related to a selected change package and all change packages that may be associated with the related files. The si resynccp command is most useful for incorporating new software features or bug fixes during the software development process.
|
|
If you are resynchronizing a change package to the sandbox of an extendable development path, subprojects in the project are extended automatically, which modifies the project. This is a special case because normally the si resynccp command modifies the project only when a propagation change package is specified. Extenddevpath permission is required when operating against the sandbox of an extendable development path.
|
For more information on how the si resynccp command works and how you can use it in your development environment, see the Windchill RV&S 帮助中心.
Options
This command takes the universal options available to all
si commands, as well as some general options. See the
options reference page for descriptions.
• --allowOpenCP
allows Windchill RV&S to resynchronize open change packages. Open change packages are not allowed if a propagation change package is specified using the --cpid option.
• --[no]alreadyInProjectIsError
Specifies whether Windchill RV&S terminates the operation if the change being applied has already been applied to the project. If this setting is negated --noalreadyInProjectIsError, then the information is displayed as a warning.
• --backFill=[cp|revision|error|skip|ask]
Specifies the way Windchill RV&S treats historic revisions required by the specified change package. For example, --backfill=ask means Windchill RV&S asks you to specify the change packages you want to exclude from the operation.
The available values for the --backFill option include:
• --backFill=cp
recursively chooses all historic revisions required by the specified change packages and applies them by updating member revisions, adding files, or dropping files.
• --backFill=revision
processes only the specified change package(s) and chooses only directly associated revisions. It does not process any change packages that are associated with intermediate revisions.
• --backFill=error
terminates the operation if other change packages are required but are not specified.
• --backFill=skip
causes Windchill RV&S to merge around specified backfill revisions. Because the Apply CP command does not perform merging, this is treated as an error in Apply CP, allowed in Resync CP.
• --backFill=ask
allows you to specify the change packages you want to include.
• --[no]ignoreUpdateRevision
ignores update revision change package entries when performing the command. The default is to include update revision entries.
• --mergeType=[confirm|cancel|automatic|manual]
specifies how you want to merge changes from the specified change package revisions into the working file in your Sandbox.
--mergeType=confirm prompts you to confirm a merge type.
--mergeType=cancel cancels the merge.
--mergeType=automatic completes the merge process without launching the Visual Merge tool.
|
|
Caution: Even if a no conflict is reported as a result of a merge operation, there can still be inconsistencies in the merge results that can only be detected by someone with an understanding of the context of the change. Therefore, anytime a merge is performed, PTC recommends that you examine and test the merged results before checking them into the repository.
|
--mergeType=manual completes the merge operation through the Visual Merge tool or a third party merge tool, depending on your Difference and Merge Tool preferences. The merge tool launches, displaying the revisions you want to merge. For more information on the Visual Merge tool, refer to the Windchill RV&S 帮助中心.
• --onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error]
specifies what to do when conflicts occur during a merge.
--onMergeConflict=confirm prompts you to confirm a merge conflict option.
--onMergeConflict=cancel cancels the merge.
--onMergeConflict=mark marks the working file indicating that merging is required without completing all of the merge related tasks. This provides the time you may need to investigate conflicts or edit difference blocks before finishing the merge.
--onMergeConflict=launchtool launches the Visual Merge tool to resolve the conflicts, all non-conflicting blocks will already have been applied.
--onMergeConflict=highlight indicates conflicts in the file with the following characters: "<<<<<<" and ">>>>>>". You are responsible for resolving conflicts in the working file.
|
|
--onMergeConflict=launchtool does not require the -g or --guioptions
|
• --[no]confirm
Confirm the actions before starting them.
--[no|confirm]createVariants
• controls whether to confirm the creation of variant projects as needed.
• --notify=[never|onCompletion|onError]
specifies whether to display a report when the command is complete. The report details the operations that were performed and any errors that were encountered.
• --notify=never
never displays the report.
• --notify=onCompletion
always displays the report.
• --notify=onError
displays the report if any errors were encountered.
• --[no]ignoreBranches
Causes Windchill RV&S to use the most recent revision when it encounters two revisions of the same member on two development paths in the change package being applied.
• --[no]ignoreServer
Causes Windchill RV&S to perform the Apply CP operation even if the change package members reside on different servers.
• --[no]continueOnErrors
Causes Windchill RV&S to continue to process the change package if errors occur while resychronizing. If the --notify option is specified as onCompletion or onError, any errors are reported when the command is complete.
• --[no|confirm]merge
controls whether to confirm all merge operations before completing them.
• --[no|confirm]mergeOnBranch
controls whether to cause Windchill RV&S to perform a merge if the target revision is on a branch. Windchill RV&S differences the two file revisions and merges any changes into the working file without modifying its revision number. You must then check in the working file to advance the revision to the next available revision number.
• --[no]otherProjectIsError
Causes Windchill RV&S to terminate the command if the member or subproject is in another project, for example, if the change package contains multiple entries in different top level projects. Change package entries referring to other projects are therefore treated as an error.
• --cpid=ID
• --changePackageID=value
specifies whether to create a propagation change package that is detached from the set of change packages it propagates (where value is the change package ID number). All the required operations are automatically represented as deferred entries (or pending entries for subproject operations). You can then discard entries that you do not want represented in the final application of changes to the project. You can also add or change entries in the propagation change package as required.
• --issueID=value
the container ID used to find the propagation change package. If the Windchill RV&S integration is enabled, the container ID is the same as the issue ID.
• --[no]spanProjects
Causes Windchill RV&S to apply the command to any member or subproject specified in the change package, even if this involves multiple projects. This option also applies across all Sandboxes and results in a search of local Sandboxes for all entries in the change package. When multiple Sandboxes are found, Windchill RV&S uses the Sandbox that contains the longest common directory prefix matching the Sandbox that the command is run from.
• --[no]useMaster
causes Windchill RV&S to operate on the top-level Sandbox.
• --[no]verbose
Means Windchill RV&S includes additional information to track the current state of the command.
• --subprojectPropagation=[explicit|implicit]
specifies how to apply subproject changes required by the specified change packages.
--subprojectPropagation=explicit creates, adds, drops, or moves a subproject only if there is a explicit command to do so in the change package.
--subprojectPropagation=implicit creates, adds, drops or moves a subproject if the operation is implicitly required based on the change package entries. For example, if you are adding a member that is part of a subproject that does not exist in the targer project being updated, the subproject is added.
• --[no|confirm]resyncIfOutOfScope
Specifies if to include entries for members in the change package that do not match the scope definition of the sandbox.
• issue...
• issue:change package id...
specifies the identification numbers for the change package you want to apply. For example, 11804:2.
Diagnostics
See the
diagnostics reference page for possible exit status values.
Preferences
Using
si setprefs or
si viewprefs, you are able to set or view the preference keys for this command.
See Also
