From svnmerge Thu Aug 06 01:33:30 2009 From: Benjamin Reed Date: Thu, 06 Aug 2009 01:33:30 +0000 To: svnmerge Subject: Re: [Svnmerge] patch: ignore corrupt entries Message-Id: <57eba2250908051833p6bae6a1t8770c0ed806fb28c () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=svnmerge&m=124952970317428 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--000e0cd6ad48710ac204706f1b10" --000e0cd6ad48710ac204706f1b10 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Tue, Aug 4, 2009 at 3:39 PM, Dustin J. Mitchell wrote= : > With apologies for taking so long, this looks fine. =A0I only have two re= quests. > > 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. --=20 Benjamin Reed a.k.a. Ranger Rick Fink, KDE, and Mac OS X development Blog: http://www.raccoonfink.com/ Music: http://music.raccoonfink.com/ --000e0cd6ad48710ac204706f1b10 Content-Type: application/octet-stream; name="svnmerge-ignore-corrupt-entries.patch" Content-Disposition: attachment; filename="svnmerge-ignore-corrupt-entries.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fy0tdeue0 KiBjb250cmliL2NsaWVudC1zaWRlL3N2bm1lcmdlL3N2bm1lcmdlLnB5CiAgKFBhdGhJZGVudGlm aWVyLmZyb21fcGF0aGlkKTogaWdub3JlIGNvcnJ1cHRlZCBvciBpbnZhbGlkIGVudHJpZXMKICAg aWYgLS1pZ25vcmUtaW52YWxpZC1lbnRyaWVzIHdhcyBzZXQKICAoZGljdF9mcm9tX3Jldmxpc3Rf cHJvcCk6IG9ubHkgc2V0IHRoZSBleHRlcm5hbCBmb3JtIGFuZCByZXZzIGlmCiAgIHBhdGhpZCBp cyB2YWxpZAogIChnbG9iYWxfb3B0cyk6IGFkZCAtLWlnbm9yZS1pbnZhbGlkLWVudHJpZXMgdG8g Z2xvYmFsIG9wdGlvbnMKClBhdGNoIGJ5OiBCZW5qYW1pbiBSZWVkIDxyYW5nZXJyaWNrQGdtYWls LmNvbT4KCkluZGV4OiBjb250cmliL2NsaWVudC1zaWRlL3N2bm1lcmdlL3N2bm1lcmdlLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGNvbnRyaWIvY2xpZW50LXNpZGUvc3ZubWVyZ2Uvc3ZubWVyZ2UucHkJKHJl dmlzaW9uIDM4NTc0KQorKysgY29udHJpYi9jbGllbnQtc2lkZS9zdm5tZXJnZS9zdm5tZXJnZS5w eQkod29ya2luZyBjb3B5KQpAQCAtMzk5LDggKzM5OSwxMSBAQAogICAgICAgICAgICAgICAgICMg d2UgY2FuIG9ubHkgY2FjaGUgdGhpcyBieSByZXBvLXJlbGF0aXZlIHBhdGgKICAgICAgICAgICAg ICAgICBQYXRoSWRlbnRpZmllci5sb2NvYmpzW3BhdGhpZF9zdHJdID0gcGF0aGlkCiAgICAgICAg ICAgICBlbHNlOgotICAgICAgICAgICAgICAgIGVycm9yKCJJbnZhbGlkIHBhdGggaWRlbnRpZmll ciAnJXMnIiAlIHBhdGhpZF9zdHIpCi0gICAgICAgIHJldHVybiBQYXRoSWRlbnRpZmllci5sb2Nv YmpzW3BhdGhpZF9zdHJdCisgICAgICAgICAgICAgICAgaWYgbm90IG9wdHNbImlnbm9yZS1pbnZh bGlkLWVudHJpZXMiXToKKyAgICAgICAgICAgICAgICAgICAgZXJyb3IoIkludmFsaWQgcGF0aCBp ZGVudGlmaWVyICclcyciICUgcGF0aGlkX3N0cikKKyAgICAgICAgaWYgUGF0aElkZW50aWZpZXIu bG9jb2Jqcy5oYXNfa2V5KHBhdGhpZF9zdHIpOgorICAgICAgICAgICAgcmV0dXJuIFBhdGhJZGVu dGlmaWVyLmxvY29ianNbcGF0aGlkX3N0cl0KKyAgICAgICAgcmV0dXJuIE5vbmUKICAgICBmcm9t X3BhdGhpZCA9IHN0YXRpY21ldGhvZChmcm9tX3BhdGhpZCkKIAogICAgIGRlZiBmcm9tX3Rhcmdl dCh0YXJnZXQpOgpAQCAtODM4LDkgKzg0MSw5IEBACiAgICAgICAgIHBhdGhpZCA9IFBhdGhJZGVu dGlmaWVyLmZyb21fcGF0aGlkKHBhdGhpZF9zdHIpCiAKICAgICAgICAgIyBjYWNoZSB0aGUgImV4 dGVybmFsIiBmb3JtIHdlIHNhdwotICAgICAgICBwYXRoaWQuZXh0ZXJuYWxfZm9ybSA9IHBhdGhp ZF9zdHIKLQotICAgICAgICBwcm9wW3BhdGhpZF0gPSByZXZzCisgICAgICAgIGlmIHBhdGhpZDoK KyAgICAgICAgICAgIHBhdGhpZC5leHRlcm5hbF9mb3JtID0gcGF0aGlkX3N0cgorICAgICAgICAg ICAgcHJvcFtwYXRoaWRdID0gcmV2cwogICAgIHJldHVybiBwcm9wCiAKIGRlZiBnZXRfcmV2bGlz dF9wcm9wKHVybF9vcl9kaXIsIHByb3BuYW1lLCByZXY9Tm9uZSk6CkBAIC0yMDI3LDYgKzIwMzAs OCBAQAogICAgICAgICAgICAgICAgICJpbXBsaWVzIC0tc2hvdy1jaGFuZ2VzIiksCiAgICAgT3B0 aW9uKCItcyIsICItLXNob3ctY2hhbmdlcyIsCiAgICAgICAgICAgIGhlbHA9InNob3cgc3VidmVy c2lvbiBjb21tYW5kcyB0aGF0IG1ha2UgY2hhbmdlcyIpLAorICAgIE9wdGlvbigiLWkiLCAiLS1p Z25vcmUtaW52YWxpZC1lbnRyaWVzIiwKKyAgICAgICAgICAgaGVscD0iaWdub3JlIGludmFsaWQg c3ZubWVyZ2UgaW5kZXhlcyIpLAogICAgIE9wdGlvbigiLXYiLCAiLS12ZXJib3NlIiwKICAgICAg ICAgICAgaGVscD0idmVyYm9zZSBtb2RlOiBvdXRwdXQgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCBw cm9ncmVzcyIpLAogICAgIE9wdGlvbkFyZygiLXUiLCAiLS11c2VybmFtZSIsCg== --000e0cd6ad48710ac204706f1b10 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Svnmerge mailing list Svnmerge@orcaware.com http://www.orcaware.com/mailman/listinfo/svnmerge --000e0cd6ad48710ac204706f1b10--