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

Re: commercial support/training on SVN for Windows?

From: phpdoc <schmad_at_gmail.com>
Date: Thu, 21 Aug 2008 19:32:37 -0700 (PDT)

> If you are making direct (manual) modifications on the
> server and then using SVN for syncing the changes then you are bound
> to get problems.

That's exactly the issue. Usually, no changes have been made on the
server. However, on one particularly-bad instance, one developer
committed a change to config.inc.php. Of course, every single working
copy had local changes in config.inc.php. While we'll never make that
mistake again, it would still be nice to be able to make changes to a
local working copy, and not have to worry about future conflict
markers showing up in one file if we do an SVN update on the entire
working copy. Perhaps this is an atypical use-case. But, we find
this to be a great use of SVN. Of course, this wouldn't be a problem
if the working copies weren't modified. However, the point of open-
source is that the end-user can modify the software. We just want an
option when updating a working copy to not update files with local
changes.

On Aug 20, 7:10 am, ianwallen <ianwal..._at_gmail.com> wrote:
> On Aug 20, 12:20 am, phpdoc <sch..._at_gmail.com> wrote:
>
> > I've used CVS and SVN everyday for years on Mac and Linux, but I'm
> > finding myself frustrated by TortoiseSVN on Windows.  Is there a
> > company (or individual) who can provide support for TortoiseSVN?  My
> > biggest problem seems to be that on the Windows server, every single
> > file generates a conflict if a change is made locally, even if that
> > change doesn't overlap the change made remotely.  I think this is a
> > line breaks issue (always fun), but I don't know how to fix this,
> > short of committing every single file with \n or Windows line breaks.
>
> Have you tried looking into the SVN property - svn:eol-style?
> Seehttp://svnbook.red-bean.com/en/1.0/ch07s02.html
>
> > Additionally, I'd love it if I could pay someone to enhance SVN.  I
> > would kill for the option to svn update without generating conflict
> > markers.  If running svn update with this option, I would prefer it if
> > files with conflicts were simply ignored and everything else updated.
> > We deploy our PHP-based software using SVN.  We then install an
> > automated script which runs svn update every night to install bug
> > fixes.  However, the conflict markers can bring down a live site if
> > we've made a tweak that conflicts with something else that's
> > committed.
>
> If you are always pulling the information from SVN and no direct
> modifications are performed on the server then there should not be any
> conflicts. If you are making direct (manual) modifications on the
> server and then using SVN for syncing the changes then you are bound
> to get problems. I had worked in a similar environment a couple years
> ago and did not have any problems.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-22 05:08:42 CEST

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