[p4] Is there way to control 'blocking' in the merge tool?

David Faison dfaison at photon.com
Wed Jun 7 14:31:05 PDT 2006


I've had some file merges where it gets uselessly out of whack.

You can just eyeball the code and see where the tool has associated a
huge segment of code from one file incorrectly, and then immediately
below it is the huge segment of corresponding code from the other file.

I'm talking like entire functions, a dozen or so lines each, that may
have one or two edits to them, but I get no help from the tool because
of how it completely fails to match them up to each other.

David Faison
Photon Research Associates



More information about the perforce-user mailing list