windows - SVN diff flagging all lines of code as new when PC programmer updates file recently committed by Mac Programmer -


In this scenario, I am currently running:

  1. Programmer A (using Mac Version of Dreamweaver) edits client.php file and creates that file in the production section of Project FU repository
  2. Programmer B (using the Windows version of Dreamweaver) contains a bug in it Fix file to file client.php file After that, he takes the cp clientInfo.php ../prod-branch/clientInfo.php to move the production branch from copying his work.
  3. Programmer B. To see if any change is made by SNB, SVN says that it has changed every line in the file!

Now, this is what I believe:

When the file is edited by Mac, then the DreamWire on Mac can be used for new Mac characters Together all windows change new characters so that it is readable in Dreamweaver. In short, Dreamweaver has changed every line in the file. Now, once committed, svn sees that the every line of the file has changed and marks the fact below. When Windows programmers make changes and new characters change again, SVN thinks that, then, the every line has changed.

My question is: How can we stop it from happening? I know there is no way to undo the damage done earlier, but I want to stop it from happening in the future. DreamWire has the option of setting this option to determine which line break type it uses.

Edit (on Mac: Dreamweaver) -> Preferences, Code format, Line break type.

To get the same settings for your users, and things should play a little better together. It would be better, if you can set your source control to ignore line break differences.


Comments

Post a Comment

Popular posts from this blog

sql - dynamically varied number of conditions in the 'where' statement using LINQ -

I am using my first project LINQ (in mvc), so maybe there's something very simple that I remember. However, a day of searching and experimenting does not work, so it works. I am trying to write a LINQ query (Linux to SQL) in which in many cases where the statement is different from an OR or an AND. We do not know how many conditions are going in the query till runtime. This search is for filter control, where the user can choose multiple criteria for filtering. Select from table where table.col = 1 or table.col = 2 or table.col = 7 .... 'Other number of conditions Before I just create the SQL query as a string, while looping over all the situations. However, it seems that there should be a good way to do this in LINQ. I tried to use Expression trees, but they had a second thought for this moment on my head, where the lambda function was to be executed inside the statement such as: values ​​for matchingRows = matchingRows for each value Where (function (row) row.c...
Read more

asp.net mvc - Dynamically Generated Ajax.BeginForm -

I have a problem with ASP.NET MVC Ajax forms. I generate many Ajax form in a table such as: & Lt; Input type = "submit" name = "activity" value = "add activity" / & gt; & Lt;%}% & gt; & Lt; / TD & gt; & Lt; / TR & gt; & Lt;%}% & gt; So far so good. When I post one of those forms, it gives a partial view in a div, and in this new partial view a new Ajax Beginnform (which is not in Genesis form) This second Ajax Beginnorf is exactly like the ones I got on the table, but when I post it, I do not get the "Ajax Post", but a normal post that sends me to a new page, I do not know whether the two Ajax forms What is the reason for the difference between, why is it the "dynamically generated" Ajax form behaves like a normal HTML form? By the way, I know that I can do it in different ways using javascript, but I would like to understand whether it can only be done using MVC helplars and Ajax lib...
Read more

Debug on symbian -

I am using trk for phone debug This works well for the Holorld project But when I start the project in phone debug mode 1) the load failed 2) TrkProtocolPlugin: to target the specified file Failure (please verify If any body understands what problem I am experiencing, then this problem helps me Pre-release If the application has the privileges assigned (with the appropriate certificate) itemprop = "text" > In your case, I will check: / li> If there is no conflict of application ID with any other application of device If there are problematic commands in the installation package (for example copy copy for non-accessible directories)
Read more