Jozef Kotlar <jozef.kotlar@eea.sk> wrote on 12/06/2005 09:46:12 AM:
> 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.
How would you solve the problem with the command line? This seems like a
fundamental problem with Subversion which you would need to solve in
Subversion.
I would think you would need for the files to be unversioned, do a revert
if necessary. Then rename the folder so it does not conflict with the
incoming change. Then do an update to get the folder from the repository,
and move the file into the newly added folder.
Is that what you would do from the command line?
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Wed Dec 7 02:10:05 2005