You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Dobler, Michael" <M....@KUEBA.ch> on 2005/02/28 14:55:26 UTC
SVN and Centura Team Developer
Hi there,
we are just starting using SVN with Centura/Gupta Team Developer 3.1. But we have one problem. SVN adds conflict markers like "<<<<<" to the source code but the Team Developer IDE cannot process this line and errors occur while opening. Is there a way to configure the marker characters so we could add a leading "!" to the marker to tell GUPTA that it's a comment line?
Thanks for any help on this
Mike
mit freundlichen Grüssen
Michael Dobler
KÜNZLER-BACHMANN RECHENZENTRUM AG
ZÜRCHERSTRASSE 601 / CH - 9015 ST. GALLEN
TELEFON ++41 +71 314 04 40 / TELEFAX ++41 +71 314 04 05
Email: mailto:m.dobler@kueba.ch <ma...@kueba.ch> Internet: http://www.kueba.ch <http://www.kueba.ch/>
Re: SVN and Centura Team Developer
Posted by kf...@collab.net.
"Dobler, Michael" <M....@KUEBA.ch> writes:
> we are just starting using SVN with Centura/Gupta Team Developer
> 3.1. But we have one problem. SVN adds conflict markers like "<<<<<"
> to the source code but the Team Developer IDE cannot process this
> line and errors occur while opening. Is there a way to configure the
> marker characters so we could add a leading "!" to the marker to
> tell GUPTA that it's a comment line?
The conflict marker symbols are not configurable, but you could use a
different diff3 program by using the --diff3-cmd option.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org