Perforce Public Knowledge Base - Multiple Resolves
× PRODUCTS SOLUTIONS CUSTOMERS LEARN SUPPORT
Downloads Company Partners Careers Contact Free Trials
Menu Search
Perforce
Reset Search
 

 

Article

Multiple Resolves

« Go Back

Information

 
Problem

Performing multiple integrations on the same file (for example, to integrate one revision or change at a time) requires multiple resolve steps.

In contrast, if you integrate all pending revisions at once, you only need one resolve step.

Solution

The first example demonstrates an integration with a single resolve step. The second example shows an iterative approach to integrating which requires multiple resolves.
 

Example 1

If you integrate two revisions or changes together, then only one resolve step is required.

C:\aaa\p4work\local\source>p4 integ rchanges.py#2,4 rc.py
//depot/source/rc.py#1 - integrate from //depot/source/rchanges.py#2,#4

C:\aaa\p4work\local\source>p4 resolve
c:/aaa/p4work/local\source\rc.py - merging //depot/source/rchanges.py#2,#4
Diff chunks: 0 yours + 11 theirs + 0 both + 0 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: s
//mb-local/source/rc.py - resolve skipped.

C:\aaa\p4work\local\source>p4 resolve ...
c:/aaa/p4work/local\source\rc.py - merging //depot/source/rchanges.py#2,#4
Diff chunks: 0 yours + 11 theirs + 0 both + 0 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: at
//mb-local/source/rc.py - copy from //depot/source/rchanges.py

C:\aaa\p4work\local\source>p4 resolve ...
... - no file(s) to resolve.

C:\aaa\p4work\local\source>p4 revert rc.py
//depot/source/rc.py#1 - was integrate, reverted


Example 2

If you integrate two changes serially, then two resolves are required.

C:\aaa\p4work\local\source>p4 integ rchanges.py#2,3 rc.py
//depot/source/rc.py#1 - integrate from //depot/source/rchanges.py#2,#3

C:\aaa\p4work\local\source>p4 integ rchanges.py#3,4 rc.py
//depot/source/rc.py#1 - integrate from //depot/source/rchanges.py#4

C:\aaa\p4work\local\source>p4 resolve ...
c:/aaa/p4work/local\source\rc.py - merging //depot/source/rchanges.py#2,#3
Diff chunks: 0 yours + 10 theirs + 0 both + 0 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: at
//mb-local/source/rc.py - copy from //depot/source/rchanges.py
c:/aaa/p4work/local\source\rc.py - merging //depot/source/rchanges.py#4
Diff chunks: 0 yours + 1 theirs + 0 both + 0 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: at
//mb-local/source/rc.py - copy from //depot/source/rchanges.py
Related Links

Feedback

 

Was this article helpful?


   

Feedback

Please tell us how we can make this article more useful.

Characters Remaining: 255