You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marc Strapetz <ma...@syntevo.com> on 2020/08/03 12:44:45 UTC
svn x-shelve fails with "checksum mismatch" error
I just gave the experimental shelve-feature a try and ran into a
"checksum mismatch" error when invoking "svn x-shelve". Any ideas how to
resolve this?
D:\temp\tiny.dir.svn>dir
...
03.08.2020 14:30 <DIR> .
03.08.2020 14:30 <DIR> ..
03.08.2020 14:30 36 sub.txt
1 File(s) 36 bytes
2 Dir(s) 4 923 518 976 bytes free
D:\temp\tiny.dir.svn>svn diff
Index: sub.txt
===================================================================
--- sub.txt (revision 960)
+++ sub.txt (working copy)
@@ -1,4 +1,4 @@
-1
+1a
2
3
4
D:\temp\tiny.dir.svn>svn info
Path: .
Working Copy Root Path: D:\temp\tiny.dir.svn
URL: file://localhost/D:/svnrepos/test/tiny/trunk/dir
Relative URL: ^/tiny/trunk/dir
Repository Root: file://localhost/D:/svnrepos/test
Repository UUID: b64c88d0-5acc-524b-887a-f04c2292f55f
Revision: 960
Node Kind: directory
Schedule: normal
Last Changed Author: marc
Last Changed Rev: 893
Last Changed Date: 2017-09-26 16:04:19 +0200 (Di, 26 Sep 2017)
D:\temp\tiny.dir.svn>svn x-shelve shelf1
--- Shelve 'shelf1' in WC root 'D:/temp/tiny.dir.svn'
--- Shelving...
Updating '.svn\experimental\shelves\v3\7368656c6631-001.wc':
At revision 960.
Sending sub.txt
Transmitting file data .svn: E200014: Checksum mismatch for
'D:\temp\tiny.dir.svn\.svn\experimental\shelves\v3\7368656c6631-001.wc\sub.txt':
expected: ec87e2cd3ddf5490cbe10e07301c114c
actual: b89724a2cec6a05364bb3af4c74fd452
Tested on Windows 8.1 with Subversion 1.14.0 (built ourselves).
--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
Re: svn x-shelve fails with "checksum mismatch" error
Posted by Marc Strapetz <ma...@syntevo.com>.
On 03.08.2020 15:19, Johan Corveleyn wrote:
> On Mon, Aug 3, 2020 at 2:44 PM Marc Strapetz <ma...@syntevo.com> wrote:
>>
>> ...
>>
>> D:\temp\tiny.dir.svn>svn x-shelve shelf1
>> --- Shelve 'shelf1' in WC root 'D:/temp/tiny.dir.svn'
>> --- Shelving...
>> Updating '.svn\experimental\shelves\v3\7368656c6631-001.wc':
>> At revision 960.
>> Sending sub.txt
>> Transmitting file data .svn: E200014: Checksum mismatch for
>> 'D:\temp\tiny.dir.svn\.svn\experimental\shelves\v3\7368656c6631-001.wc\sub.txt':
>> expected: ec87e2cd3ddf5490cbe10e07301c114c
>> actual: b89724a2cec6a05364bb3af4c74fd452
>>
>> Tested on Windows 8.1 with Subversion 1.14.0 (built ourselves).
>
> I think this is known as issue SVN-4827 (svn x-shelve gives E200014:
> Checksum mismatch when using eol-style=native or keywords)
>
> https://issues.apache.org/jira/browse/SVN-4827
Thanks, I can confirm that after resetting svn:eol-style, shelve works
as expected.
--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
Re: svn x-shelve fails with "checksum mismatch" error
Posted by Johan Corveleyn <jc...@gmail.com>.
On Mon, Aug 3, 2020 at 2:44 PM Marc Strapetz <ma...@syntevo.com> wrote:
>
> I just gave the experimental shelve-feature a try and ran into a
> "checksum mismatch" error when invoking "svn x-shelve". Any ideas how to
> resolve this?
>
> D:\temp\tiny.dir.svn>dir
> ...
> 03.08.2020 14:30 <DIR> .
> 03.08.2020 14:30 <DIR> ..
> 03.08.2020 14:30 36 sub.txt
> 1 File(s) 36 bytes
> 2 Dir(s) 4 923 518 976 bytes free
>
> D:\temp\tiny.dir.svn>svn diff
> Index: sub.txt
> ===================================================================
> --- sub.txt (revision 960)
> +++ sub.txt (working copy)
> @@ -1,4 +1,4 @@
> -1
> +1a
> 2
> 3
> 4
>
> D:\temp\tiny.dir.svn>svn info
> Path: .
> Working Copy Root Path: D:\temp\tiny.dir.svn
> URL: file://localhost/D:/svnrepos/test/tiny/trunk/dir
> Relative URL: ^/tiny/trunk/dir
> Repository Root: file://localhost/D:/svnrepos/test
> Repository UUID: b64c88d0-5acc-524b-887a-f04c2292f55f
> Revision: 960
> Node Kind: directory
> Schedule: normal
> Last Changed Author: marc
> Last Changed Rev: 893
> Last Changed Date: 2017-09-26 16:04:19 +0200 (Di, 26 Sep 2017)
>
>
> D:\temp\tiny.dir.svn>svn x-shelve shelf1
> --- Shelve 'shelf1' in WC root 'D:/temp/tiny.dir.svn'
> --- Shelving...
> Updating '.svn\experimental\shelves\v3\7368656c6631-001.wc':
> At revision 960.
> Sending sub.txt
> Transmitting file data .svn: E200014: Checksum mismatch for
> 'D:\temp\tiny.dir.svn\.svn\experimental\shelves\v3\7368656c6631-001.wc\sub.txt':
> expected: ec87e2cd3ddf5490cbe10e07301c114c
> actual: b89724a2cec6a05364bb3af4c74fd452
>
> Tested on Windows 8.1 with Subversion 1.14.0 (built ourselves).
I think this is known as issue SVN-4827 (svn x-shelve gives E200014:
Checksum mismatch when using eol-style=native or keywords)
https://issues.apache.org/jira/browse/SVN-4827
Seems there is already a regression test for it. I suppose a patch
would be very welcome ;-).
--
Johan