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

Re: Conflict handling in win32

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2005-01-18 17:25:29 CET

This has been brought up several times before. Unfortunately, even
though your suggestion has merit, it would break compatibility with
older clients. It would therefore be impossible to implement this before
version 2.0, which is still pretty far off in the distance.

You might have luck on the TSVN list if you asked for the ability to
customize the "Edit Conflicts" option to specify an external program,
much as they currently allow with the diff/merge operations. That way
you could write a batch script to copy the files to a temp dir with the
appropriate extensions, then call pspice from there. As long as it saved
the results back to the original location, it should work.

cvh@viller.org wrote:

>Hi
>
>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?
>
>Regards
>Christian
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 18 17:28:00 2005

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