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

Re: can't update after having updated a sub-part of the tree

From: jerome lacoste <jerome.lacoste_at_gmail.com>
Date: 2005-10-06 20:08:06 CEST

On 10/6/05, Ryan Schmidt <subversion-2005@ryandesign.com> wrote:
> On Oct 6, 2005, at 19:25, jerome lacoste wrote:
> > Summary:
> >
> > 1- svn co tree
> > 2- svn move many many things. svn delete some.
> > 3- someone makes check-ins in the mean time
> > 4- I make a svn up on an old part of the tree (from which files had
> > been moved out), because one file was deleted by accident and I needed
> > to get it back.
> > 5- svn up on the whole tree fails to update the moved files
> That is correct. Subversion does not automatically propagate the
> changes. You have to do it manually.

MMm I thought that if I didn't do the svn update on the test-1/olddir,
then the update would be been automatically propagated. But I can't
reproduce it now. Probably my mistake then.

> > I have now a big restructuration that I cannot commit because of that.
> > I am unable to get the changes others made on the files, and hence I
> > don't dare committing.
> You should be able to manually determine what changes were made to
> the file under its old name. Look at the svn log to see the revisions
> in which changes were made. Use svn diff to get the exact changes.
> Apply the changes (using Unix patch or equivalent) to your renamed
> file. Now you can commit.

I have to do that for each file?

I moved over 2000 files....

There's not way I can achieve that with merging?



To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 6 20:10:23 2005

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.