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

Conflict on directories

From: Jozef Kotlar <jozef.kotlar_at_eea.sk>
Date: 2005-12-06 15:46:12 CET


I need to explain, how to solve conflicts on directories inside
Subclipse. Browsing in mailing list archive didn't help. :-(

I am using Eclipse 3.1.1 + Subclipse 0.9.37 against Subversion 1.2.3

Say, developer A creates locally new package a.b.c with some classes.
There is no package a.b in that moment.
In meanwhile other developer B creates package a.b.d and commits.

What is supposed the developer A to do to solve this situation:

If the a.v is still unversioned, I will get "is not versioned".
If I schedule it for add, I will get "already exists".

Well, I know what to do using command line tools, but it requires to
step out of Eclipse and there is bunch
of Windows developers in my company used only to Eclipse IDE and I would
like to provide them with IDE solution. They are used to CVS and there
wasn't such problem.

Received on Wed Dec 7 01:46:12 2005

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

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