[p4] Merging without resolve?
jeffjensen at upstairstechnology.com
Thu Oct 13 11:54:47 PDT 2005
You can launch the P4 merge programs by passing the 3 files to them on the
command line (e.g. base, left, right). So you could get the 2 other file
versions and rename them or put them in a different directory, and pass all 3
to the P4 merge program.
What IDE are you using? Can you use the IDE's merge tool with the IDE's
Perforce plugin to get the versions to compare?
Quoting Matthew Vegh <Matthew.Vegh at embarcadero.com>:
> 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?
More information about the perforce-user