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

Conflict handling in win32

From: <cvh_at_viller.org>
Date: 2005-01-18 11:11:25 CET


I have tried to look through the archives to find my answer, but I couldn't.
I am trying to see if svn could work in our design flow. We use pspice in
windows, which isn't a problem, but when there is a conflict, svn makes
filename.sch.rOLDREV filename.sch.rNEWREV and .mine. This would have been
ok, if we were using a text editor, but I'm not sure that I can convince
the designers to find that clever...
Is it possible to move the .rX and .mine before the extension?
I'm using TortoiseSVN as client. I have been thinking about making a hack,
but I don't know what to hack - client or server?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 18 10:55:44 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.