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

[Rich Ireland]

David Faison wrote:
> 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.

This can happen if you have line ending differences.  Check for a 
developer that is submitting windows CR-LF style files over Unix style 
files or vice-versa.

-- 
Rich Ireland
mailto:r.ireland at computer.org
Embedded & Real Time Engineering