[SVN-4677] svn up fails after a file is replaced by a directory

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[SVN-4677] svn up fails after a file is replaced by a directory

Orivej Desh
I filed a bug at https://issues.apache.org/jira/browse/SVN-4677
Since the mailing list seems more active, I copy it here.

* * *

svn up fails after a file is added, moved, deleted, replaced by a
directory, and a file in the directory is deleted


This bug was introduced in r1586953 [1], is present in all releases
since 1.9.0, and can be fixed by reverting that commit. The following
script reproduces it:

     rm -rf repo repo1 repo2

     svnadmin create repo
     svn co "file://$(pwd)/repo" repo1

     cd repo1
     mkdir a
     svn add a
     svn commit -m 1
     svn up

     echo fa > a/fa
     svn add a/fa
     svn commit -m 2
     svn up

     svn mv a b
     svn commit -m 3
     svn up

     svn rm b/fa
     svn commit -m 4
     svn up

     mkdir b/fa/
     touch b/fa/fb
     svn add b/fa
     svn commit -m 5
     svn up

     svn rm b/fa/fb
     svn commit -m 6
     svn up

     cd ..
     svn co "file://$(pwd)/repo" repo2 -r5
     cd repo2
     svn up

svn up fails with

     Updating '.':
     svn: E160016: Failure opening '/b/fa/fb'
     svn: E160016: '/b/fa' is not a directory in filesystem '1d2dc934-16b4-452c-a607-a6080764124e'

Additionally, when reporting `Failure opening '/b/fa/fb'`, it would
have been quite useful for subversion to tell in which revision
`'/b/fa' is not a directory`.

[1] http://svn.apache.org/viewvc?view=revision&revision=1586953
Reply | Threaded
Open this post in threaded view
|

Re: [SVN-4677] svn up fails after a file is replaced by a directory

Johan Corveleyn-3
On Thu, Apr 6, 2017 at 6:10 AM, Orivej Desh <[hidden email]> wrote:

> I filed a bug at https://issues.apache.org/jira/browse/SVN-4677
> Since the mailing list seems more active, I copy it here.
>
> * * *
>
> svn up fails after a file is added, moved, deleted, replaced by a
> directory, and a file in the directory is deleted
>
>
> This bug was introduced in r1586953 [1], is present in all releases
> since 1.9.0, and can be fixed by reverting that commit. The following
> script reproduces it:
>
>      rm -rf repo repo1 repo2
>
>      svnadmin create repo
>      svn co "file://$(pwd)/repo" repo1
>
>      cd repo1
>      mkdir a
>      svn add a
>      svn commit -m 1
>      svn up
>
>      echo fa > a/fa
>      svn add a/fa
>      svn commit -m 2
>      svn up
>
>      svn mv a b
>      svn commit -m 3
>      svn up
>
>      svn rm b/fa
>      svn commit -m 4
>      svn up
>
>      mkdir b/fa/
>      touch b/fa/fb
>      svn add b/fa
>      svn commit -m 5
>      svn up
>
>      svn rm b/fa/fb
>      svn commit -m 6
>      svn up
>
>      cd ..
>      svn co "file://$(pwd)/repo" repo2 -r5
>      cd repo2
>      svn up
>
> svn up fails with
>
>      Updating '.':
>      svn: E160016: Failure opening '/b/fa/fb'
>      svn: E160016: '/b/fa' is not a directory in filesystem '1d2dc934-16b4-452c-a607-a6080764124e'
>
> Additionally, when reporting `Failure opening '/b/fa/fb'`, it would
> have been quite useful for subversion to tell in which revision
> `'/b/fa' is not a directory`.
>
> [1] http://svn.apache.org/viewvc?view=revision&revision=1586953

Thanks for reporting this, with clear repro steps and even pinpointing
the revision :-).

I think Stefan Fuhrman knows the most about that particular revision,
so I'm guessing he can evaluate this best. Stefan?

--
Johan
Reply | Threaded
Open this post in threaded view
|

Re: [SVN-4677] svn up fails after a file is replaced by a directory

Orivej Desh
Stefan, could you please consider this bug report?

* Johan Corveleyn <[hidden email]> [2017-04-07]

> On Thu, Apr 6, 2017 at 6:10 AM, Orivej Desh <[hidden email]> wrote:
> > I filed a bug at https://issues.apache.org/jira/browse/SVN-4677
> > Since the mailing list seems more active, I copy it here.
> >
> > * * *
> >
> > svn up fails after a file is added, moved, deleted, replaced by a
> > directory, and a file in the directory is deleted
> >
> >
> > This bug was introduced in r1586953 [1], is present in all releases
> > since 1.9.0, and can be fixed by reverting that commit. The following
> > script reproduces it:
> >
> >      rm -rf repo repo1 repo2
> >
> >      svnadmin create repo
> >      svn co "file://$(pwd)/repo" repo1
> >
> >      cd repo1
> >      mkdir a
> >      svn add a
> >      svn commit -m 1
> >      svn up
> >
> >      echo fa > a/fa
> >      svn add a/fa
> >      svn commit -m 2
> >      svn up
> >
> >      svn mv a b
> >      svn commit -m 3
> >      svn up
> >
> >      svn rm b/fa
> >      svn commit -m 4
> >      svn up
> >
> >      mkdir b/fa/
> >      touch b/fa/fb
> >      svn add b/fa
> >      svn commit -m 5
> >      svn up
> >
> >      svn rm b/fa/fb
> >      svn commit -m 6
> >      svn up
> >
> >      cd ..
> >      svn co "file://$(pwd)/repo" repo2 -r5
> >      cd repo2
> >      svn up
> >
> > svn up fails with
> >
> >      Updating '.':
> >      svn: E160016: Failure opening '/b/fa/fb'
> >      svn: E160016: '/b/fa' is not a directory in filesystem '1d2dc934-16b4-452c-a607-a6080764124e'
> >
> > Additionally, when reporting `Failure opening '/b/fa/fb'`, it would
> > have been quite useful for subversion to tell in which revision
> > `'/b/fa' is not a directory`.
> >
> > [1] http://svn.apache.org/viewvc?view=revision&revision=1586953 
>
> Thanks for reporting this, with clear repro steps and even pinpointing
> the revision :-).
>
> I think Stefan Fuhrman knows the most about that particular revision,
> so I'm guessing he can evaluate this best. Stefan?
Reply | Threaded
Open this post in threaded view
|

Re: [SVN-4677] svn up fails after a file is replaced by a directory

Stefan Fuhrmann
On 01.05.2017 20:48, Orivej Desh wrote:
> Stefan, could you please consider this bug report?

Orivej,

Thanks for the detailed bug report!
It made the issue easy to track down and fix (r1795116).

May or may not make it into 1.9.6.

-- Stefan^2.

>
> * Johan Corveleyn <[hidden email]> [2017-04-07]
>> On Thu, Apr 6, 2017 at 6:10 AM, Orivej Desh <[hidden email]> wrote:
>>> I filed a bug at https://issues.apache.org/jira/browse/SVN-4677
>>> Since the mailing list seems more active, I copy it here.
>>>
>>> * * *
>>>
>>> svn up fails after a file is added, moved, deleted, replaced by a
>>> directory, and a file in the directory is deleted
>>>
>>>
>>> This bug was introduced in r1586953 [1], is present in all releases
>>> since 1.9.0, and can be fixed by reverting that commit. The following
>>> script reproduces it:
>>>
>>>       rm -rf repo repo1 repo2
>>>
>>>       svnadmin create repo
>>>       svn co "file://$(pwd)/repo" repo1
>>>
>>>       cd repo1
>>>       mkdir a
>>>       svn add a
>>>       svn commit -m 1
>>>       svn up
>>>
>>>       echo fa > a/fa
>>>       svn add a/fa
>>>       svn commit -m 2
>>>       svn up
>>>
>>>       svn mv a b
>>>       svn commit -m 3
>>>       svn up
>>>
>>>       svn rm b/fa
>>>       svn commit -m 4
>>>       svn up
>>>
>>>       mkdir b/fa/
>>>       touch b/fa/fb
>>>       svn add b/fa
>>>       svn commit -m 5
>>>       svn up
>>>
>>>       svn rm b/fa/fb
>>>       svn commit -m 6
>>>       svn up
>>>
>>>       cd ..
>>>       svn co "file://$(pwd)/repo" repo2 -r5
>>>       cd repo2
>>>       svn up
>>>
>>> svn up fails with
>>>
>>>       Updating '.':
>>>       svn: E160016: Failure opening '/b/fa/fb'
>>>       svn: E160016: '/b/fa' is not a directory in filesystem '1d2dc934-16b4-452c-a607-a6080764124e'
>>>
>>> Additionally, when reporting `Failure opening '/b/fa/fb'`, it would
>>> have been quite useful for subversion to tell in which revision
>>> `'/b/fa' is not a directory`.
>>>
>>> [1] http://svn.apache.org/viewvc?view=revision&revision=1586953
>> Thanks for reporting this, with clear repro steps and even pinpointing
>> the revision :-).
>>
>> I think Stefan Fuhrman knows the most about that particular revision,
>> so I'm guessing he can evaluate this best. Stefan?
>