patch: ignore corrupt entries

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

patch: ignore corrupt entries

Benjamin Reed-3
I ran into a problem where we had some hand-edited svnmerge-integrated
properties in our repository.  Since svnmerge evaluate entries in old
revisions, there's no way (without archive surgery) to retroactively
change a busted svnmerge-integrated property.

Instead, I made a small patch to svnmerge.py to accept the option
"--ignore-corrupt-entries" where it will ignore the broken entries,
rather than bomb out with a cryptic "svnmerge: Invalid path identifier
''" message.

I apologize if I've failed at python-isms, I haven't dabbled in python
for probably 5 years, but I muddled through to something that behaved
right for me.  I hope this would be accepted for what it is: a total
hack.  ;)

Attached is the patch to current svnmerge.py trunk.

--
Benjamin Reed a.k.a. Ranger Rick
Fink, KDE, and Mac OS X development

Blog: http://www.raccoonfink.com/
Music: http://music.raccoonfink.com/

_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge

svnmerge-ignore-corrupt-entries.patch (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: patch: ignore corrupt entries

Dustin J. Mitchell-3
On Tue, May 19, 2009 at 5:35 PM, Benjamin Reed<[hidden email]> wrote:
> Attached is the patch to current svnmerge.py trunk.

With apologies for taking so long, this looks fine.  I only have two requests.

1. Please name it something like "--ignore-invalid-properties"

2. Please include the appropriate commit header in your patch -- see
the Subversion Hacking document
(http://subversion.tigris.org/hacking.html#log-messages).

Dustin

--
Open Source Storage Engineer
http://www.zmanda.com
_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge
Reply | Threaded
Open this post in threaded view
|

Re: patch: ignore corrupt entries

Benjamin Reed-3
On Tue, Aug 4, 2009 at 3:39 PM, Dustin J. Mitchell<[hidden email]> wrote:

> With apologies for taking so long, this looks fine.  I only have two requests.
>
> 1. Please name it something like "--ignore-invalid-properties"
>
> 2. Please include the appropriate commit header in your patch -- see
> the Subversion Hacking document
> (http://subversion.tigris.org/hacking.html#log-messages).

Done, and done.  I've not submitted anything to subversion before, so
if I missed something, please let me know.

Attached is the updated version.

--
Benjamin Reed a.k.a. Ranger Rick
Fink, KDE, and Mac OS X development

Blog: http://www.raccoonfink.com/
Music: http://music.raccoonfink.com/

_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge

svnmerge-ignore-corrupt-entries.patch (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: patch: ignore corrupt entries

Dustin J. Mitchell-3
On Wed, Aug 5, 2009 at 9:33 PM, Benjamin Reed<[hidden email]> wrote:
> Done, and done.  I've not submitted anything to subversion before, so
> if I missed something, please let me know.

This looks fine, but at the moment my commit rights are broken, so I
will commit it as soon as those are fixed.

Dustin

--
Open Source Storage Engineer
http://www.zmanda.com
_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge
Reply | Threaded
Open this post in threaded view
|

Re: patch: ignore corrupt entries

Dustin J. Mitchell-3
On Thu, Aug 13, 2009 at 11:11 AM, Dustin J. Mitchell<[hidden email]> wrote:
> This looks fine, but at the moment my commit rights are broken, so I
> will commit it as soon as those are fixed.

Well, that was quick:
 r38727

Thanks again!

Dustin

--
Open Source Storage Engineer
http://www.zmanda.com
_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge