[nycbug-talk] [OT] - Subversion Conflicts

[Bjorn Nelson]

Matt Juszczak wrote:
> First, as a disclaimer, I know this is a HORRIBLE temporary solution, but 
> I promise it's temporary for those who want to yell :) Does anyone know a 
> way to tell SVN "If the file has changed locally, don't check out the 
> latest version remotely, and instead ignore it?".  I'd obviously like to 
> do this with a flag.
Not sure about svn, but p4 won't overwrite a file that has the write 
permission bit set.  By default, when you checkin/submit, it makes all 
files ro or rx.

-Bjorn