[nycbug-talk] [OT] - Subversion Conflicts

Mikel King mikel.king at olivent.com
Sat Jun 27 11:29:33 EDT 2009

you can svn delete the log files and what not, they will remain in  
their revision level so you will not loose them. a better option may  
be to mlsvn mv them to another location in the repo so that they do  
not get checked out w/ the running code.


On Jun 27, 2009, at 10:08, Matt Juszczak <matt at atopia.net> wrote:

> Hi all,
> Sorry to bother the list, but this is a problem I just encountered  
> that is
> somewhat time sensitive, so I thought I would get some opinions from  
> the
> group.
> I'm moving to a new temporary code deployment solution.  The prior  
> setup
> didn't use SVN at all - people edited on the dev server, and then  
> rsync's
> the code to the production server.
> The new setup (TEMPORARY for a few weeks until I can get real
> repositoriees going) is that I checked in the entire webroot into an  
> repository, and then I have the webs check that out.  That way, if  
> someone
> edits something, they check it in, and then
> This is gigs of code and I didn't have much time to go through it,  
> so I
> added everything to SVN, even log files.  What I'm having trouble with
> right now is this: on the initial checkout to the webservers, it works
> fine, but it creates these log files.  Of course, the log files aren't
> empty - they are in a state that they were in when I checked them  
> into SVN
> originally.  Over time, those log files begin to get written to, to  
> where
> if I do an svn stat in the webroot, it shows they've changed.
> No big deal, until I try to run an svn update again after a full  
> check in
> from the dev server - the log files show conflicts, because they've
> changed on both servers.
> 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.
> Thanks!
> -M
> _______________________________________________
> talk mailing list
> talk at lists.nycbug.org
> http://lists.nycbug.org/mailman/listinfo/talk

More information about the talk mailing list