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

Re: Adding a new file to a patch work flow problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-12-18 18:22:44 CET

On Wed, 2003-12-17 at 14:22, Barry Scott wrote:
> I came across this problem when I was submitting a patch against
> rapidsvn. IS this a candidate to fix for 1.0 as this is very
> inconvenient for patch submitters? Do you want a issue logged?
> Workflow:
> 1. create patch that adds a file
> 2. submit patch to maintainer
> 3. maintainer merges the patch to the repo
> 4. update wc fails

Your recipe below isn't a bug. 'svn up' is trying to add a file to the
working copy. If an unversioned file by the same name is obstructing
the addition, that's a real obstruction. If a file by the same is
scheduled for addition, that's an obstruction as well. Subversion
doesn't have any way of knowing that the schedule-add file is identical
to the one 'svn up' is trying to add.

I suppose it could compare the two files byte-for-byte, and then do a
"tree merge" during the update, effectively undoing the schedule-add.
But that's a whole new class of sophistication. libsvn_wc simply
doesn't do tree-merges yet. This is just one of many, many examples
where 'svn up' halts because it doesn't know how to do tree merges.
Adding these sorts of heuristics is a post-1.0 feature request.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 18 18:23:52 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.