Updating involving deleted/moved directories

[Jack Ivey <iv...@altair.com>]

Hi all,
I've run up against a problem when updating a working area after
a directory has been moved.  If the client finds any files
that are not under version control, it stops in the middle
with an error message.  If you run update again, the command
runs to completion, (unless another non-version-controlled file
is hit).  

If you keep running update until it completes, you end up with 
all the non-version-controlled files left where they were, 
and the version-controlled files in the new location.

We have all sorts of files not under version control and it's a 
real nuisance to clean them out before you do an update or to 
have to run update 20 or 30 times.

My question is, why do I have to run the update multiple 
times to get this to happen?  Shouldn't the behavior be:
- Move the version-controlled files to the new location
- Leave non-version-controlled files where they were
- Give a warning message saying that's that what happened.

Why the error?

Thanks,
Jack

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Updating involving deleted/moved directories

[Ben Collins-Sussman <su...@collab.net>]

On Tue, 2004-03-16 at 09:35, Jack Ivey wrote:
> Hi all,
> I've run up against a problem when updating a working area after
> a directory has been moved.  If the client finds any files
> that are not under version control, it stops in the middle
> with an error message.  If you run update again, the command
> runs to completion, (unless another non-version-controlled file
> is hit).  

The problem here is that svn's move operation isn't a "true move".  It's
a copy of a directory, and the deletion of the old directory.

So when your working copy receives a move, it's getting an "addition" of
a new directory (which historically, is a copy of the old one), and also
trying to outright delete the old directory.

Subversion will never destroy unversioned data, however.  So if it's
trying to delete a versioned directory that contains unversioned data,
it will delete everything *but* the paths that lead down to the
unversioned data.

> If you keep running update until it completes, you end up with 
> all the non-version-controlled files left where they were, 
> and the version-controlled files in the new location.

I don't understand what errors you're getting.  You say that 'svn up'
"stops in the middle with an error message".  That's too vague a
description.  Try sending us either a transcript, or an exact
reproduction recipe that demonstrates the problem.




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org