[p4] Merging without resolve?

Jeff Grills 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.
 
j
 

-----Original Message-----
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
merged version?

 

Thanks,

Matt

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.perforce.com/pipermail/perforce-user/attachments/20051013/a00b55c9/attachment-0006.html>


More information about the perforce-user mailing list