[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: Barry Scott <barry_at_barrys-emacs.org>
Date: 2003-12-18 23:47:45 CET

At 18-12-2003 17:22, Ben Collins-Sussman wrote:

>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.

O.k. post 1.0 sigh...

My expectation was that svn up would see that the file is added in the
wc and update wants to add so they match semantically. Then it would
just do the merge/conflict stuff as happens to versioned files.


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