You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Neels J Hofmeyr <ne...@elego.de> on 2011/09/09 16:41:52 UTC
Re: 1.7.0 upgrade doesn't properly follow svn:externals
On 09/08/2011 06:21 PM, Scott Palmer wrote:
> Just tried 1.7.0RC2 and noticed that bugs with svn upgrade are still present.
>
> If you have svn:externals in the top level of your working copy they seem to
> be converted, but if those external references also use svn:externals then
> those nested working copies are not upgraded.
>
> Is anyone else seeing this?
Hi Scott,
thanks for the report! I can reproduce the problem with attached test
script. (The script uses my local bin/svn paths of built Subversion
versions, so I also attached a screenshot output.)
I am "moving" this discussion to the dev@ list, please reply there.
Note that the test upgrades the external dir XB, but fails to upgrade the
nested external dir XB/XC:
[[[
...
Fetching external item into 'XB/XC'
A XB/XC/c
Updated external to revision 1.
...
+ svn upgrade
Upgraded '.'
Upgraded 'B'
Upgraded 'C'
Upgraded 'XB'
Upgraded 'B/XC'
]]]
And note that a .svn dir remains in XB/XC (seen in the final 'ls')
I'll see if I can find a solution.
~Neels
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Scott Palmer <sc...@digitalrapids.com>.
On 2011-09-09, at 11:59 AM, Neels J Hofmeyr wrote:
> On 09/09/2011 05:25 PM, Scott Palmer wrote:
>> Btw, I haven't had a chance to go back to 1.6 to test - is the issue with svn:externals referencing a file fixed? It used to add the file as both an external and a regular file so it was conflicting with itself.
>>
>> Scott
>
> Are you referring to issue #4000?
> http://subversion.tigris.org/issues/show_bug.cgi?id=4000
>
> If not, do you have a link or a reproduction script?
>
> Thanks,
> ~Neels
It may be related, and possibly it fixes the issue I encountered, but it is not exactly the same. What happened in my case is that a file external was in my 1.6 working copy and the svn upgrade appeared to add it as a "first-class node" while leaving it as an external as well. From that point on "svn update" would complain about overwriting the first-class node when attempting to update the external reference.
Sorry I don't have a reproduction script - I'm not currently set up to run both 1.6 and 1.7 to build one.
I suppose you can start with the first part of the script in issue #4000 but use svn 1.6 up to the point of creating the wWC with the file external and checking it out. Then just switch to 1.7 and attempt an upgrade and update.
Scott
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Neels J Hofmeyr <ne...@elego.de>.
On 09/09/2011 05:59 PM, Neels J Hofmeyr wrote:
> On 09/09/2011 05:25 PM, Scott Palmer wrote:
>> Btw, I haven't had a chance to go back to 1.6 to test - is the issue with svn:externals referencing a file fixed? It used to add the file as both an external and a regular file so it was conflicting with itself.
>>
>> Scott
>
> Are you referring to issue #4000?
> http://subversion.tigris.org/issues/show_bug.cgi?id=4000
No, you are referring to issue #4015
http://subversion.tigris.org/issues/show_bug.cgi?id=4015
We are (read: philip is) currently in the process of fixing it, and it
hopefully will be fixed in RC3.
~Neels
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Neels J Hofmeyr <ne...@elego.de>.
On 09/09/2011 05:25 PM, Scott Palmer wrote:
> Btw, I haven't had a chance to go back to 1.6 to test - is the issue with svn:externals referencing a file fixed? It used to add the file as both an external and a regular file so it was conflicting with itself.
>
> Scott
Are you referring to issue #4000?
http://subversion.tigris.org/issues/show_bug.cgi?id=4000
If not, do you have a link or a reproduction script?
Thanks,
~Neels
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Scott Palmer <sc...@digitalrapids.com>.
On 2011-09-09, at 11:14 AM, Neels J Hofmeyr wrote:
> On 09/09/2011 04:41 PM, Neels J Hofmeyr wrote:
>> And note that a .svn dir remains in XB/XC (seen in the final 'ls')
>
> I would like to add that 'upgrade' does leave the .svn folders behind
> everywhere, but running 'svn info' in the separate folders confirms that BX/
> is a 1.7 WC and BX/CX is not.
>
> ~Neels
I was actually wondering when you mentioned it if .svn folders weren't expected to be in "external" working copies. I'm just so used to how Subversion has worked in the past. I expect any sub-tree of my working copy to function as a working copy even if it was moved elsewhere. While it shouldn't be a problem to come around to the new way, I though that externals might somehow be an exception - as if they were an independent checkout.
Btw, I haven't had a chance to go back to 1.6 to test - is the issue with svn:externals referencing a file fixed? It used to add the file as both an external and a regular file so it was conflicting with itself.
Scott
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Neels J Hofmeyr <ne...@elego.de>.
To end the confusion: .svn folders are left behind only in working copy
roots. Dir externals are working copy roots and should therefore have a .svn
folder after 'svn upgrade', but it should be a 1.7-.svn. (thx Bert)
~Neels
On 09/09/2011 05:14 PM, Neels J Hofmeyr wrote:
> On 09/09/2011 04:41 PM, Neels J Hofmeyr wrote:
>> And note that a .svn dir remains in XB/XC (seen in the final 'ls')
>
> I would like to add that 'upgrade' does leave the .svn folders behind
> everywhere, but running 'svn info' in the separate folders confirms that BX/
> is a 1.7 WC and BX/CX is not.
>
> ~Neels
>
Re: 1.7.0 upgrade doesn't properly follow svn:externals
Posted by Neels J Hofmeyr <ne...@elego.de>.
On 09/09/2011 04:41 PM, Neels J Hofmeyr wrote:
> And note that a .svn dir remains in XB/XC (seen in the final 'ls')
I would like to add that 'upgrade' does leave the .svn folders behind
everywhere, but running 'svn info' in the separate folders confirms that BX/
is a 1.7 WC and BX/CX is not.
~Neels