I am using P4V (windows client for PerForce) with BC3 as my diff/merge tool. I did a merge recently, with the left and center files pulled from the PerForce repository, and apprently moved to my local disk with PC line endings (CRLF), and the right file (my version) from a network attached Linux drive with Unix line endings (LF only). After the merge, the output file was saved with PC line endings. When I checked this in, it was stored the same way.
Unfortunately, our corporate standard is Unix line endings.
I cannot use the setting to always consider line ending differences during compares, since the windows PerForce client always converts repository files to PC style when creating temp files for compare and our checked out versions on Linux always have Unix style line endings. I just need to make sure that when I save the merged output, is uses Unix-style line endings (or I need someplace I can specify this as a default, or specify which of the input file's style the output should conform to).
Unfortunately, our corporate standard is Unix line endings.
I cannot use the setting to always consider line ending differences during compares, since the windows PerForce client always converts repository files to PC style when creating temp files for compare and our checked out versions on Linux always have Unix style line endings. I just need to make sure that when I save the merged output, is uses Unix-style line endings (or I need someplace I can specify this as a default, or specify which of the input file's style the output should conform to).
Comment