You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Bjørn T Johansen <bt...@havleik.no> on 2008/06/10 11:56:03 UTC
Problem because of coworker has renamed folders?
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
--
-----------------------------------------------------------------------------------------------
Bjørn T Johansen
btj@havleik.no
-----------------------------------------------------------------------------------------------
Someone wrote:
"I understand that if you play a Windows CD backwards you hear strange Satanic messages"
To which someone replied:
"It's even worse than that; play it forwards and it installs Windows"
-----------------------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Re: Problem because of coworker has renamed folders?
Posted by Bjørn T Johansen <bt...@havleik.no>.
On Wed, 11 Jun 2008 09:01:47 -0400
"Bicking, David (HHoldings, IT)" <Da...@thehartford.com> wrote:
>
> > -----Original Message-----
> > From: svn interested [mailto:svn@yogasurftech.de]
> >
> > Bjørn 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.
This is what I ended up doing... The switch commando just kept failing with "Won't delete locally modified directory" so I gave up....
BTJ
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Re: Problem because of coworker has renamed folders?
Posted by "Bicking, David (HHoldings, IT)" <Da...@thehartford.com>.
> -----Original Message-----
> From: svn interested [mailto:svn@yogasurftech.de]
>
> Bjørn 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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem because of coworker has renamed folders?
Posted by svn interested <sv...@yogasurftech.de>.
Bjørn 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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org