Setup:
Development environment : Server 2008 file share, we'll call it \\devserver\files
Production environment: Server 2008 with SFTP (using CrushFTP). We'll call this sftp://[email protected] I'm using PPK authentication.
BeyondCompare3 Pro for Windows (3.3.4 build 14431)
I've been running into problems when attempting to merge some file changes from the dev environment to the production environment. Here's a specific example: (but it seems to happen on almost all merges of this sort).
I needed to merge some changes (3 lines) in the middle of an asp file over to production.
That change merged fine, however there was an additional change that got written to the bottom of the destination file. It went from:
to:
As you can see, the tail end of line 43 all the way to the end of the file was appended to the end of the destination file.
Of course, when I run the compare again, BC3 recognizes that difference (the extra lines). If I try to merge that change over again (just the removal of the extra lines), the same thing happens.
I've confirmed that the files have the same <line endings> set <CR><LF>. I've updated the Transfer Type to Binary in the Transfer tab of the FTP profile.
I can't figure out why this is happening? Any ideas?
Thanks in advance!
Jason
Development environment : Server 2008 file share, we'll call it \\devserver\files
Production environment: Server 2008 with SFTP (using CrushFTP). We'll call this sftp://[email protected] I'm using PPK authentication.
BeyondCompare3 Pro for Windows (3.3.4 build 14431)
I've been running into problems when attempting to merge some file changes from the dev environment to the production environment. Here's a specific example: (but it seems to happen on almost all merges of this sort).
I needed to merge some changes (3 lines) in the middle of an asp file over to production.
Code:
<tr> Just some junk to test merge. </tr>
Code:
43: <td align="center" valign="middle"><img src="<%=sSource%>" alt="" border="0"/></td> 44: </tr> 45: </table> 46: </body> 47: </html>
Code:
43: <td align="center" valign="middle"><img src="<%=sSource%>" alt="" border="0"/></td> 44: </tr> 45: </table> 46: </body> 47: </html>rder="0"/></td> 48: </tr> 49: </table> 50: </body> 51: </html>
Of course, when I run the compare again, BC3 recognizes that difference (the extra lines). If I try to merge that change over again (just the removal of the extra lines), the same thing happens.
I've confirmed that the files have the same <line endings> set <CR><LF>. I've updated the Transfer Type to Binary in the Transfer tab of the FTP profile.
I can't figure out why this is happening? Any ideas?
Thanks in advance!
Jason
Comment