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

RE: Re: Repo Browser folder rename and uncommitted changes

From: Jerry Steele <jsteele_at_hdlcompanies.com>
Date: Fri, 4 Jan 2008 13:59:13 -0800

Stefan Küng wrote:
> Jerry Steele wrote:
> > We had some developers that were working on the Trunk of Project1
> > with uncommitted changes in their working copies. Using the
> > Repository Browser, I renamed the project folder ("Project1" to
> > "ProjectX"). However, when the developers updated their working
> > copies before committing their local changes, all their local
> > changes were blown away. Needless to say, this was a pretty costly
> > surprise.
>
> Are you sure they simply updated? That should not interfere with
> their local changes at all. If it did, then that's a bug (a serious
> one) in the Subversion library. I can't imagine such a bug going
> unnoticed by the Subversion developers.

I believe that when they ran the update, it deleted all the files from
their working folder, thus deleting all the changes they had made. I
am guessing that they then checked out the committed code from the new
folder.
 
> > I think this has something to do with the move/delete method of
> > renaming.
> >
> > If anybody has checked out code in a sub-folder, must I ensure that
> > they have no uncommitted changes before renaming the parent
> > folder?
>
> That shouldn't be necessary.
> But if local modifications really should get lost, try switching the
> working copies first to the new name of the project (new url). That
> will not (definitely not, I've done that several times) lose local
> modifications.

I think that is what we'll have to do - that just involves a bit of
coordination between the repository admin and anyone who has checked
out any sub-folders. The developers will have to understand that when
a folder rename happens, they MUST update the working copy URL *before*
doing an update -- otherwise all their current files will be deleted.

...

Hm, before I fired off this email, I decided to test this myself, and I
get a "Target path does not exist" error when trying to update my local
copy after the parent folder name change, so that doesn't jive with the
developers' story of "I just clicked on update".

If I check out the project folder (so that I have the Branches, Tags,
and Trunk folders in my working folder), then rename the project folder
using the Repository Browser, then when I update, I do not get an error,
but the message log says that the Branches, Tags, and Trunk folders are
deleted. However, this just removes them from source control -- the
folders and files are still there with all the local changes intact.

I think the devs have some explaining to do...

Thanks for your time,

-Jerry

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-04 22:59:21 CET

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

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