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

Re: Sparse working copy in 1.8.0 causes problems for others' merges; 1.7.x didn't complain

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 14 May 2013 09:25:33 -0400

On 05/13/2013 09:58 PM, Bob Cardillo wrote:
> I'm running Subversion 1.8.0-dev on Windows 7 Pro SP1.
>
> The following steps went through without error on 1.7.x, but they fail with
> an error on the last step when run on 1.8.0 (see below for full reproducible
> recipe):
> 1. make a copy (branch) of your trunk
> 2. Harry checks out the branch in full
> 3. Sally sparsely checks out the branch with just a subset of subtrees
> 4. someone adds something in trunk under one of the subtrees that Sally has
> excluded
> 5. someone removes something from trunk under the subtree added in step 4
> 6. Sally merges trunk into the branch (remember she has the sparse working
> copy)
> 7. Harry merges trunk into the branch
> BAM! Harry can't commit the merge because:
> svn: E155011: Commit failed (details follow):
> svn: E155011: Directory 'C:\testbranch1_userX\B\B1\B1a' is out of date
> svn: E160028: '/branches/branch1/B/B1/B1a' is out of date
>
> I suspect this has something to do with one or both of these two issues,
> completed in 1.8.0:
> - http://subversion.tigris.org/issues/show_bug.cgi?id=4305
> - http://subversion.tigris.org/issues/show_bug.cgi?id=4169
>
> Can someone confirm?

I can confirm this same behavior on Linux.

If I change the final commit into an 'svn st -v' instead, I see this for 1.7
clients:

 M 6 6 cmpilato .
                 6 1 cmpilato B
A + - 3 ? B/B1
D + - ? ? B/B1/B1a
D + - ? ? B/B1/B1a/test.txt
   + - 3 cmpilato B/B1/test.txt
                 6 6 cmpilato C
                 6 6 cmpilato C/C1
                 6 4 cmpilato C/C1/test.txt

And this for 1.8.0 clients:

 M 6 6 cmpilato .
                 6 1 cmpilato B
A + - 3 cmpilato B/B1
D + - ? ? B/B1/B1a
A + - 3 cmpilato B/B1/test.txt
                 6 6 cmpilato C
                 6 6 cmpilato C/C1
                 6 4 cmpilato C/C1/test.txt

I've attached my Unix-ized version of your recipe script in case someone
else wants to take a look-see.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

Received on 2013-05-14 15:26:31 CEST

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