[p4] p4 diff2 and suppressing EOL differences

Ivey, William william_ivey at bmc.com
Mon Jan 8 10:23:03 PST 2007


Hmm, I was looking at the content of one of the file's RCS ,v
file and noticed one of the deltas ended with ^M^M - wasn't
sure why at the time.

However, in this specific case I think I've tracked it down to
a user who had their client set to "local" - I think they may
have passed the local copy of their file to someone who
submitted it from their client (which is set to "unix"). 

-Wm


> -----Original Message-----
> From: Smith, Jeff [mailto:jsmith at medplus.com]
> Sent: Monday, January 08, 2007 9:56 AM
> To: dlewis78731 at gmail.com; Ivey, William
> Cc: perforce-user at perforce.com
> Subject: RE: [p4] p4 diff2 and suppressing EOL differences
> 
> 
> I've seen this problem and I think I know how it occurs.
> 
> It looks as though the LineEnding style win (and local on a Windows
> machine) automatically converts a LF to a CR,LF pair.  This 
> is a problem
> if the file in the depot has a CR,LF in it already.  This can 
> result in
> a CR,CR,LF in the file when it is pulled down.  Give some 
> strange client
> sharing, it is even possible to get the CR,CR,LF back up into 
> Perforce.
> 
> Ultimately, I think that the Perforce client shouldn't add a CR before
> the LF if one is already there. 
 



More information about the perforce-user mailing list