[p4] Merging without resolve?
jgrills at drivensnow.org
Thu Oct 13 10:30:15 PDT 2005
If you merely want to back out the changes in revision 6, try this:
p4 sync MyClass.java#5
p4 edit MyClass.java
p4 sync MyClass.java#6
p4 resolve -ay MyClass.java
p4 sync MyClass.java#head
p4 resolve -am MyClass.java
This will go back to #5, sync to version #6 and resolve the differences by
ignoring all the changes in #6, then sync to head and resolve by merging in
all the changes from #7 to #12.
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Matthew Vegh
Sent: Thursday, October 13, 2005 12:14 PM
To: perforce-user at perforce.com
Subject: [p4] Merging without resolve?
Given a file with a number of linear revisions, is it possible to open a
P4WinMerge dialog with 2 historical revisions? If so, how?
Example: MyClass.java#6 introduced changes that are no longer wanted.
MyClass.java#12 is the head revision. Can I open MyClass.java#12 for edit
and bring up a 3-way merge showing panes with #6, #8 and the prospective
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the perforce-user