[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: pointing diff3-cmd to false.bat does not seem to work for me

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-27 19:38:09 CEST

Michael Toal wrote:
[snip]
> I don't like it either, and I am trying to avoid it.
> Keeping all files read-only until a lock is obtained also seems to be
> serializing development.
> I'm not sure what svn would do on a later update if someone changed the
> read only attribute and changed the code.
>
> The point that people are making to me is that a change in file A can
> may have an impact on your code in file B.
> So, they want to review the changes on update, by manually merging the
> files - Always.
>
> OK so the problem I still have is this scenario:
> 2 developers both checkout the same revision.
> Developer A makes changes to file 1 - which will impact on Developer B
> code changes to file 2
> Developer A commits changes
> Developer B changes file 2
> Developer B updates
> Updates from developer A are merged into developer B's code -
> automatically.
> Those updates caused an intermittent bug, when combined to changes made
> to file 2.
>
> I had hoped that pointing diff-cmd to false.bat would cause this to
> happen, but it doesn't seem to work for me.

Check out the FAQ here:
http://tortoisesvn.net/node/241

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Oct 27 19:38:18 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.