On 2019-08-30 10:18, Johan Corveleyn wrote:
> On Fri, Aug 30, 2019 at 9:12 AM Mark P. <svn_at_peralex.com> wrote:
>>
>> On 2019-08-30 06:11, Johan Corveleyn wrote:
>>> On Wed, Jul 31, 2019 at 7:20 AM Mark P. <svn_at_peralex.com> wrote:
>>>>
>>>>
>>>>
>>>> svn x-shelve shelf1
>>>>
>>>> I get the following output:
>>>>
>>>> Updating '.svn\experimental\shelves\v3\7368656c6631-001.wc':
>>>> At revision 1.
>>>> Sending main.cpp
>>>> Transmitting file data .svn: E200014: Checksum mismatch for
>>>> 'C:\Shared\Test\Test3\.svn\experimental\shelves\v3\7368656c6631-001.wc\main.cpp':
>>>> expected: b77dd03a6c3f68f496d874153363694e
>>>> actual: 7f081249d3e4e1383afb2798d46a58f5
>>>>
>>>
>>> Hi Mark,
>>>
>>> Sorry for the late response.
>>> This looks to me like a bug with the experimental shelving feature in 1.12.
>>>
>>> Is the file main.cpp "translated" into Windows end-of-line style in
>>> the Windows working copy (vs. Unix eol-style on the FreeBSD machine),
>>> i.e. does it carry the svn property "svn:eol-styl=native"? Perhaps
>>> there is a bug when shelving, in that one side is eol-translated (and
>>> checksummed) and the other is not.
>>>
>>
>> Hi Johan,
>>
>> Thanks for the reply. Yes, you're correct, svn:eol-style was set to
>> 'native', and I think this is where the bug lies.
>>
>> I removed the property, ran:
>>
>> svn x-shelve shelf2
>>
>> and it seems to work as expected now, although ideally shelve should be
>> able to work with eol-style=native.
>>
>> Mark
>
> [ Re-adding the users_at_s.a.o list back to cc. Please use reply all to
> keep the list in the loop. ]
Sorry about that.
>
> Okay, thanks for checking this, and thanks for reporting this in the
> first place.
> So indeed this seems like a bug in x-shelve when working with
> eol-style=native (and shelving it in a Windows working copy).
>
> Could you please file an issue for that in our issue tracker?
> https://issues.apache.org/jira/browse/SVN
Thanks for your attention. I've created the issue here:
https://issues.apache.org/jira/browse/SVN-4827
>
> If you would like to dig in further (going through the source code,
> reading our community guide, possibly writing a patch etc. -- see
> [1]), you're very welcome to do so. (no problem if you don't, your
> report of the issue is already very useful)
>
> Thanks,
>
Disclaimer: http://www2.peralex.com/disclaimer.html
Received on 2019-08-30 11:02:25 CEST