Re: [Subclipse-users] Merge produces extra files and decorators

Tom Henricksen <TomH@A-t-g.com> wrote on 11/07/2006 12:07:37 PM:

> We are using Eclipse 3.1.2 and Subclipse 1.0.3 on Windows XP with
Subversion
> 1.4. When we merge files I believe Subclipse creates files with
extension
> like .mine, .r4538, and .r4540. Is there a way to turn this off? Also
it
> adds decorators in the source file to designate what revision add what
file.
> Something like the following:

That is Subversion, not Subclipse, doing that. See the following from the
book:

http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Nov 7 19:11:18 2006