subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Johan Corveleyn <jcor...@gmail.com>
Subject Re: My mixed revision working copy remains after a 'svn update'
Date Thu, 18 Aug 2016 19:55:38 GMT
On Thu, Aug 18, 2016 at 9:33 PM,  <webster.brent@rogers.com> wrote:
> Yes, these externals are deliberately pegged and I have other working
> copies(WC) based on the exact same checkout and they show up as a single and
> not a mixed revision WC.
>
> Of the 108 WCs I've looked at, 36 are in a mixed-revision configuration and
> that's OK but in several cases, these WCs cannot be updated back to a single
> revision configuration. As well, the svnversion command is indicating that
> these WCs are 'Switched' but that has not been the case, they have never
> been switched.
>
> At this point, I'm recommending to my users to delete any WC that cannot by
> configured back into a single revision WC.
>
> Comments, suggestions, recommendations would be great.

Okay, let's take another look at your initial problem description:

>> On Aug 16, 2016, at 2:54 PM, webster.brent@rogers.com wrote:
>>
>> My mixed revision working copy remains mixed revision after multiple
>> attempts with 'svn update'.
>> Here's the final status output:
>>
>> [linux] >> svn st -u
>> X                    vobs/common/cpCommon
>> X                    vobs/common/dclCommon
>> X                    vobs/ots/broadcom/BCM_SDK_6.4.11
>> X                    vobs/ots/osm4/Apps/HalServer/Drivers/lim400/Lim400API
>> X                    vobs/ots/osm4/Target/PldImages/lim400g_1
>> X                    vobs/ots/osm4/Tests/framework/tl1probe/mteraiv
>> X                    vobs/ots/uboot/u-boot-2009.06
>> X                    vobs/ots/uboot/u-boot-2013.01.01
>> X                    vobs/ots/wrlplat/tlab_qemuppc
>> X                    vobs/ots/wrlplat/tlab_xeoncore50
>> X                    vobs/ots/wrlplat/tlabqoriq50_small
>> X                    vobs/prod
>> Status against revision:  13673
>>
>> Performing status on external item at
>> 'vobs/ots/osm4/Target/PldImages/lim400g_1':
>> Status against revision:  87468
>>
>> Performing status on external item at 'vobs/ots/uboot/u-boot-2009.06':
>> Status against revision:    475
>>
>> Performing status on external item at 'vobs/common/cpCommon':
>> Status against revision:    101
>>
>> Performing status on external item at 'vobs/common/dclCommon':
>> Status against revision:    101
>>
>> Performing status on external item at 'vobs/ots/uboot/u-boot-2013.01.01':
>> Status against revision:    475
>>
>> Performing status on external item at 'vobs/ots/wrlplat/tlab_xeoncore50':
>> Status against revision:    539
>>
>> Performing status on external item at 'vobs/prod':
>> Status against revision:  1290
>>
>> Performing status on external item at 'vobs/ots/broadcom/BCM_SDK_6.4.11':
>> Status against revision:    614
>>
>> Performing status on external item at
>> 'vobs/ots/osm4/Tests/framework/tl1probe/mteraiv':
>> X
>> vobs/ots/osm4/Tests/framework/tl1probe/mteraiv/TL1_Library
>> Status against revision:  2575
>>
>> Performing status on external item at
>> 'vobs/ots/osm4/Tests/framework/tl1probe/mteraiv/TL1_Library':
>> Status against revision:  65663
>>
>> Performing status on external item at
>> 'vobs/ots/wrlplat/tlabqoriq50_small':
>> Status against revision:    672
>>
>> Performing status on external item at 'vobs/ots/wrlplat/tlab_qemuppc':
>> Status against revision:    403
>>
>> Performing status on external item at
>> 'vobs/ots/osm4/Apps/HalServer/Drivers/lim400/Lim400API':
>> Status against revision:  73002
>>
>> [Linux] >> svnversion
>> 475:13673S
>>
>> There are two 'uboot' svn:externals pegged at 475 so I deleted the parent
>> directory (i.e. rm -rf vobs/ots/uboot) and did another 'svn update' but that
>> didn't clean it up.  The svnversion is still reporting 475:13673S.
>>
>> The svn client version is 1.8.14.
>>
>> Thanks in advance for any insights.

About your directory deletion: just deleting the vobs/ots/uboot
directory from disk will not change anything, because you're only
deleting local file data, not changing any of the svn metadata
(including the svn:externals definitions), which are contained in your
wcroot/.svn directory. To really get rid of those vobs/ots/uboot
externals you should remove their definition from the relevant
svn:externals property, and run another 'svn update'.

Now, what strikes me as odd: svnversion reports 475:13673S, and you
have two vobs/ots/uboot directories which seem to be configured at
that revision (output of 'svn st -u' talks about "Status against
revision:    475"). But for vobs/common/cpCommon and
vobs/common/dclCommon status reports "Status against revision:
101". So why doesn't svnversion say 101:13673S? What's special about
the externals definitions of the vobs/ots/uboot dirs, compared to the
vobs/common/* dirs? Are they configured differently?

Something else to try: install a 1.9.4 svn client and see what it does
with that same working copy. What does it report? Is it able to
restore your desired single-revisionness after an 'svn update'?

-- 
Johan

Mime
View raw message