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

Re: [Subclipse-users] Share project into existing folder

From: Niklas Gustavsson <niklas_at_protocol7.com>
Date: 2005-12-26 13:21:53 CET

Huibert Gill wrote:
> To write code to handle the undefined states files in a mixed new/checked-out
> mixup you would produce when you work the way you describe will be verry
> dificult, and error prone.
>
> Just as an example, if you have created a file A and then fetch the project
> afterwards, where file A allready existst, is it a collision?
> If file A existst in the project, you should write your own, before knowing
> the contents... can subversion safely merge changes ?

This sounds very much like the conflict that would occur when you'r out
of sync with the repos (e.g. someone else has created file A and
commited before you did).

> It just sounds like a bad idea for me.

It might very well be :-)

TortoiseSVN handles this by issuing a series of adds (for each
file/directory in the root folder) with a warning that it will cause
several revisions. I'm not saying this is a good idea, just that it
would fit what my natural way of working (I might very well be the only
misfit ;-)

/niklas

>
> happy hacking!
>
> Huibert Gill
>
>
>
> Am Sonntag 25 Dezember 2005 00:02 schrieb Niklas Gustavsson:
>
>>Hi
>>
>>thanks for an excellent plugin!
>>
>>When sharing a new project into SVN, the wizard for doing that operation
>>requires the server folder to be non-existing. This clashes somewhat
>>with the (possibly stupid) way I'm used to working with SVN. When
>>starting up a new project I always create the project folder in SVN with
>>the standard subfolders (trunk, tags, branches). Then, when sharing the
>>project I allways have to bang my head and remove the trunk folder. Now,
>>I realize that there is probably a good reason for the Subclipse
>>requirement but I thought I should ask. Would it be possible to remove
>>or relax (like requiring an empty folder) this anyway?
>>
>>/niklas
>>
>>-------
>>Niklas Gustavsson
>>http://www.protocol7.com
>>mailto:niklas@protocol7.com
>>
>>
>>---------------------------------------------------------------------
>>To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
>>For additional commands, e-mail: users-help@subclipse.tigris.org

-- 
-------
Niklas Gustavsson
http://www.protocol7.com
mailto:niklas@protocol7.com
Received on Mon Dec 26 23:21:53 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.