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

Re: [Issue 1554] Cannot update past an "obstructed" item

From: <kfogel_at_collab.net>
Date: 2003-10-16 20:38:47 CEST

Brandon Ehle <azverkan@yahoo.com> writes:
> 1) Run svn up.
> 2) Delete or Backup the file in question.
> 3) Run svn up.
> 4) Optionally copy his file back over the original if its the one he
> wants to replace.
> 5) Repeat steps 1 through 4 about 100 times.
> As you can see, that doesn't make for very happy artists.
> There are a couple things wrong with this model:
> * Bob can't see the full list of obstructed files, because he would
> have to repeat step 2 writing down every file that he moved.
> * Bob knows more about the relationship of the files being stored than
> the repository, but cannot exercise this knowledge.
> * Artist Carl might need some help from Bob before Bob is finished his
> current stuff. If Carl's stuff is in the same directory there is a
> 50/50 chance that Bob will be able to pull Carl's stuff from the
> repository depending on the order that the files are retrieved via svn
> up.

I realize that workarounds are never fun, but there is one for this:

After the first obstruction, Bob makes a temp dir T, uses 'svn st' to
find all unversioned files, moves them into T, and reruns the update.
After he's got all the repository versions, he can compare against
what he has in T and decide what to do from there.

Your lather-rinse-repeat method is fine for one or two files, but the
workaround starts to make sense if you've got 100 obstructions...


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 16 21:16:01 2003

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

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