You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Wood <mw...@its.uct.ac.za> on 2003/10/02 12:39:08 UTC
svnadmin dump/load broken for prop deletes?
In one of my repositories I added a file which accidentally had the
executable bit set. Subversion, of course, set the svn:executable
property for me. I committed this before realising it, and later
committed a propdel of svn:executable on this file.
Today I dumped this repository with svnadmin from 0.25.0 in order to
upgrade to 0.30.0. I loaded it into a new repository. Just to make
sure things were as they should be, I dumped the new repository and
diffed the two dump files. The only significant difference concerned
the svn:executable prop on the above file.
Here's the relevant section of the diff:
--- old.dump 2003-10-02 12:26:18.000000000 +0200
+++ new.dump 2003-10-02 12:33:22.000000000 +0200
[...]
@@ -11068,9 +11068,13 @@
Node-path: XXXX/xxxx.xxx
Node-kind: file
Node-action: change
-Prop-content-length: 59
-Content-length: 59
+Prop-content-length: 85
+Content-length: 85
+K 14
+svn:executable
+V 1
+*
K 13
svn:mime-type
V 24
@@ -17109,7 +17113,7 @@
[...]
On further investigation I found that the working copy believed there
not to be an svn:executable property set on the file:
$ svn up wc
At revision 22.
$ svn pl -v wc/XXXX/xxxx.xxx
Properties on 'wc/XXXX/xxxx.xxx':
svn:mime-type : application/octet-stream
But the repository did not agree:
$ svn pl -v file://`pwd`/repo/XXXX/xxxx.xxx
Properties on 'file:///[...]/repo/XXXX/xxxx.xxx':
svn:executable : *
svn:mime-type : application/octet-stream
I was able to reproduce the symptoms using only version 0.30.0, but the
dump file diff is different:
$ svn --version
svn, version 0.30.0 (r7178)
compiled Sep 30 2003, 15:40:18
Copyright (C) 2000-2003 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- handles 'http' schema
- handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
- handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' schema
$ svnadmin create r1
$ svn co file://`pwd`/r1 wc1
Checked out revision 0.
$ touch wc1/test
$ chmod +x wc1/test
$ svn add wc1/test
A wc1/test
$ svn ci -m "" wc1
Adding wc1/test
Transmitting file data .
Committed revision 1.
$ svn pdel svn:executable wc1/test
property 'svn:executable' deleted from 'wc1/test'.
$ svn ci -m "" wc1
Sending wc1/test
Committed revision 2.
$ svnadmin dump r1 >r1.dump
* Dumped revision 0.
* Dumped revision 1.
* Dumped revision 2.
$ svnadmin create r2
$ svnadmin load r2 <r1.dump
<<< Started new txn, based on original revision 1
* adding path : test ... done.
------- Committed revision 1 >>>
<<< Started new txn, based on original revision 2
* editing path : test ... done.
------- Committed revision 2 >>>
$ svn co file://`pwd`/r2 wc2
A wc2/test
Checked out revision 2.
$ svn pl -v wc2/test
Properties on 'wc2/test':
svn:executable : *
You have new mail in /var/mail/michael
$ svnadmin dump r2 >r2.dump
* Dumped revision 0.
* Dumped revision 1.
* Dumped revision 2.
$ diff -u r1.dump r2.dump
--- r1.dump 2003-10-02 14:15:43.000000000 +0200
+++ r2.dump 2003-10-02 14:16:33.000000000 +0200
@@ -63,12 +63,3 @@
2003-10-02T12:15:28.256434Z
PROPS-END
-Node-path: test
-Node-kind: file
-Node-action: change
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by "B. W. Fitzpatrick" <fi...@red-bean.com>.
brane@xbc.nu writes:
> Aaargh! I actually did that! I couldn've sworn I wen't through the diffs
> with a fine comb several times before I committed...
That's it. You're getting a salary cut.
-Fitz
--
Brian W. Fitzpatrick <fi...@red-bean.com> http://www.red-bean.com/fitz/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by "C. Michael Pilato" <cm...@collab.net>.
David Summers <da...@summersoft.fay.ar.us> writes:
> >> (parse_property_block): Geez. Undo what appears to be an accidental
> >> removal of some crucial code by Brane back in revision 5476. Did
> >> somebody resolve a conflict the wrong way? This re-fixes the bug
> >> addressed originally by Sussman back in revision 5420.
>
> What impact (if any) does this have on repositories up to 7273?
>
> The reason I'm asking is because I've got a server at
> subversion-0.27.0 that I'm getting ready to update to 0.30.0 and would
> like to know if I'm going to run into any problems when I do the dump
> 0.27.0 / restore 0.30?
The impact is that if you have used revisions 5476-7273 to *load* a
dumpfile, and that dumpfile contains instances where a file or
directory has had properties removed, those removals will not actually
be preserved in the newly loaded repository.
If you have reason to believe that your repository has such things, I
recommend waiting until 0.31 is released (which is supposed to happen
Real Soon Now).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by David Summers <da...@summersoft.fay.ar.us>.
Branko Čibej wrote:
>Michael Wood wrote:
>
>
>
>>On Thu, Oct 02, 2003 at 09:55:25AM -0500, C. Michael Pilato wrote:
>>
>>
>>
>>
>>>"C. Michael Pilato" <cm...@collab.net> writes:
>>>
>>>
>>>
>>>
>>>
>>>>Yep, it's a bug in the loader code. This is now my highest priority
>>>>issue.
>>>>
>>>>
>>>>
>>>>
>>>See revision 7273. And thanks for the excellent report and recipe.
>>>Your extra few minutes of effort probably saved me an hour of work.
>>>
>>>
>>>
>>>
>>Glad I could help.
>>
>>------------------------------------------------------------------------
>>rev 7273: cmpilato | 2003-10-02 16:51:47 +0200 (Thu, 02 Oct 2003) | 6 lines
>>Changed paths:
>> M /trunk/subversion/libsvn_repos/load.c
>>
>>* subversion/libsvn_repos/load.c
>> (parse_property_block): Geez. Undo what appears to be an accidental
>> removal of some crucial code by Brane back in revision 5476. Did
>> somebody resolve a conflict the wrong way? This re-fixes the bug
>> addressed originally by Sussman back in revision 5420.
>>
>>------------------------------------------------------------------------
>>
>>
>>
>>
>Aaargh! I actually did that! I couldn've sworn I wen't through the diffs
>with a fine comb several times before I committed...
>
>/me off to find a hole to hide in
>
>
>
>
What impact (if any) does this have on repositories up to 7273?
The reason I'm asking is because I've got a server at subversion-0.27.0
that I'm getting ready to update to 0.30.0 and would like to know if I'm
going to run into any problems when I do the dump 0.27.0 / restore 0.30?
Thanks,
- David Summers
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by Branko Čibej <br...@xbc.nu>.
Michael Wood wrote:
>On Thu, Oct 02, 2003 at 09:55:25AM -0500, C. Michael Pilato wrote:
>
>
>>"C. Michael Pilato" <cm...@collab.net> writes:
>>
>>
>>
>>>Yep, it's a bug in the loader code. This is now my highest priority
>>>issue.
>>>
>>>
>>See revision 7273. And thanks for the excellent report and recipe.
>>Your extra few minutes of effort probably saved me an hour of work.
>>
>>
>
>Glad I could help.
>
>------------------------------------------------------------------------
>rev 7273: cmpilato | 2003-10-02 16:51:47 +0200 (Thu, 02 Oct 2003) | 6 lines
>Changed paths:
> M /trunk/subversion/libsvn_repos/load.c
>
>* subversion/libsvn_repos/load.c
> (parse_property_block): Geez. Undo what appears to be an accidental
> removal of some crucial code by Brane back in revision 5476. Did
> somebody resolve a conflict the wrong way? This re-fixes the bug
> addressed originally by Sussman back in revision 5420.
>
>------------------------------------------------------------------------
>
>
Aaargh! I actually did that! I couldn've sworn I wen't through the diffs
with a fine comb several times before I committed...
/me off to find a hole to hide in
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by Michael Wood <mw...@its.uct.ac.za>.
On Thu, Oct 02, 2003 at 09:55:25AM -0500, C. Michael Pilato wrote:
> "C. Michael Pilato" <cm...@collab.net> writes:
>
> > Yep, it's a bug in the loader code. This is now my highest priority
> > issue.
>
> See revision 7273. And thanks for the excellent report and recipe.
> Your extra few minutes of effort probably saved me an hour of work.
Glad I could help.
------------------------------------------------------------------------
rev 7273: cmpilato | 2003-10-02 16:51:47 +0200 (Thu, 02 Oct 2003) | 6 lines
Changed paths:
M /trunk/subversion/libsvn_repos/load.c
* subversion/libsvn_repos/load.c
(parse_property_block): Geez. Undo what appears to be an accidental
removal of some crucial code by Brane back in revision 5476. Did
somebody resolve a conflict the wrong way? This re-fixes the bug
addressed originally by Sussman back in revision 5420.
------------------------------------------------------------------------
I thought it sounded familiar :)
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by "C. Michael Pilato" <cm...@collab.net>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Yep, it's a bug in the loader code. This is now my highest priority
> issue.
See revision 7273. And thanks for the excellent report and recipe.
Your extra few minutes of effort probably saved me an hour of work.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by "C. Michael Pilato" <cm...@collab.net>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Michael Wood <mw...@its.uct.ac.za> writes:
>
> > In one of my repositories I added a file which accidentally had the
> > executable bit set. Subversion, of course, set the svn:executable
> > property for me. I committed this before realising it, and later
> > committed a propdel of svn:executable on this file.
>
> [...]
>
> Thanks for the recipe. I'm looking at this *right now*.
Yep, it's a bug in the loader code. This is now my highest priority
issue.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnadmin dump/load broken for prop deletes?
Posted by "C. Michael Pilato" <cm...@collab.net>.
Michael Wood <mw...@its.uct.ac.za> writes:
> In one of my repositories I added a file which accidentally had the
> executable bit set. Subversion, of course, set the svn:executable
> property for me. I committed this before realising it, and later
> committed a propdel of svn:executable on this file.
[...]
Thanks for the recipe. I'm looking at this *right now*.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org