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

RE: Re: Problem because of coworker has renamed folders?

From: Bicking, David (HHoldings, IT) <David.Bicking_at_thehartford.com>
Date: Wed, 11 Jun 2008 09:01:47 -0400

> -----Original Message-----
> From: svn interested [mailto:svn_at_yogasurftech.de]
>
> Bjrn T Johansen wrote:
> > I have a problem with my checked out files... I have been
> working on
> > some files and at the same time, a coworker has changed the
> name of many of the folders higher up in the hierarchy... How
> can I commit my files now that the folder names aren't the
> same anymore?
> > Can I just do an update and then commit or are there any
> special steps I need to do so my changes aren't lost?
> >
> >
> > Regards,
> >
> > BTJ
> >
> You have to do an "svn switch" so that your working copy will
> point again to a valid location in your repository
>
> Greetings,
> Lutz Dornbusch

Are you sure that will work? As I understand it, the problem is that someone moved or renamed folders within a particular project and the level at which he would "switch" is higher. This would also leave the working copy in a state that does not resemble the real project structure.

I would export the contents of the folders that were renamed that have changes to somewhere else on the file system, then update the working copy (which might require a revert, first). At this point the working copy will match the repository. I'd take the exported files and place them in the new proper locations. The ones I changed show up as "changed". Finally, I'd commit.

--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-11 15:02:15 CEST

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

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