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?
See http://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-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-20 13:11:28 CEST