0

I have an SVN repository managing our project and we have a config file for the app that has been committed to the base so that every developer can get the format. He/she is then required to modify that file to match their system's settings. I recently committed my copy of the config file (by mistake) and on the next update, everyone else was automatically updated to my copy rather than SVN declaring a conflicted state. The following line particularly intrigues me:

<Address>http://192.168.1.136:8080/FeatureServer</Address>

This is my local IP address and each developer has to modify this line to point it to their IP address. Once I committed my file, SVN now just updates everyone else's config files to my copy on an 'Update'. Why is that so? Is it because this is not a code file and SVN somehow knows it ? I do get conflicts in code files so I don't think SVN is somehow messed up. What's special in this case?

I use TortoiseSVN 1.7.4 over Windows 7 on a 64 bit machine.

Thanks

4

1 に答える 1

0

開発者が自分の側でファイルを変更していない場合は、サーバーから更新を受け取ります。コピーを変更してから更新すると、競合が発生します。

于 2012-05-03T22:18:03.763 に答える