Return-Path: X-Original-To: apmail-maven-dev-archive@www.apache.org Delivered-To: apmail-maven-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3DD79613 for ; Tue, 24 Jan 2012 19:27:16 +0000 (UTC) Received: (qmail 15593 invoked by uid 500); 24 Jan 2012 19:27:16 -0000 Delivered-To: apmail-maven-dev-archive@maven.apache.org Received: (qmail 15416 invoked by uid 500); 24 Jan 2012 19:27:15 -0000 Mailing-List: contact dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Maven Developers List" Reply-To: "Maven Developers List" Delivered-To: mailing list dev@maven.apache.org Received: (qmail 15408 invoked by uid 99); 24 Jan 2012 19:27:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 19:27:15 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [204.13.248.71] (HELO mho-01-ewr.mailhop.org) (204.13.248.71) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 19:27:09 +0000 Received: from adsl-074-170-244-147.sip.gnv.bellsouth.net ([74.170.244.147] helo=Vega.local) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.72) (envelope-from ) id 1Rpm12-000MkL-8I for dev@maven.apache.org; Tue, 24 Jan 2012 19:26:48 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 74.170.244.147 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+6leakyRIlAAAZ6KVUTZwA Message-ID: <4F1F05F6.9040606@commonjava.org> Date: Tue, 24 Jan 2012 14:26:46 -0500 From: John Casey User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: Maven Developers List Subject: script for applying Git patches to SVN Content-Type: multipart/mixed; boundary="------------040404050202030005000300" --------------040404050202030005000300 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit FWIW, I've written a little ruby script to help me manage/automate the process of applying patches across from my github mirrors to SVN. I'll attach it here in case anyone is interested. I know, I could use git svn dcommit...but I've run into so many problems trying to initialize a git repo clone against the SVN repository, that I find that approach almost unusable. At least once I've managed to get my IP address banned for DOSing the svn server. :-) Anyway, this is something I've started using; maybe it'll be useful to others. -john -- John Casey Developer, PMC Chair - Apache Maven (http://maven.apache.org) Blog: http://www.johnofalltrades.name/ --------------040404050202030005000300 Content-Type: text/x-ruby-script; name="git-svn-apply.rb" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="git-svn-apply.rb" IyEvdXNyL2Jpbi9lbnYgcnVieQoKcmVxdWlyZSAnb3B0cGFyc2UnCnJlcXVpcmUgJ3RlbXBm aWxlJwoKY2xhc3MgR2l0MlN2blBhdGNoZXIKICAKICBkZWYgaW5pdGlhbGl6ZSggYXJncz1b XSApCiAgICBAb3B0aW9ucyA9IHt9CiAgICBPcHRpb25QYXJzZXIubmV3IHt8b3B0c3wKICAg ICAgb3B0cy5vbiggJy1pJywgIi0taW5wdXQ9RElSIiwgIkdpdCBzb3VyY2UgZGlyZWN0b3J5 IiApe3xkaXJ8IEBvcHRpb25zWzpzb3VyY2VdID0gZGlyfQogICAgICBvcHRzLm9uKCAnLW8n LCAiLS1vdXRwdXQ9RElSIiwgIlNWTiB0YXJnZXQgZGlyZWN0b3J5IiApe3xkaXJ8IEBvcHRp b25zWzp0YXJnZXRdID0gZGlyfQogICAgICBvcHRzLm9uKCAnLXMnLCAiLS1zdWJqZWN0PVNV QkpFQ1QiLCAiSklSQSBpc3N1ZSBJRCAob3B0aW9uYWwpIil7fHN1YmplY3R8IEBvcHRpb25z WzpzdWJqZWN0XSA9IHN1YmplY3R9CiAgICAgIG9wdHMub24oICctTicsICItLW51bWJlcj1O VU0iLCAiTnVtYmVyIG9mIGNvbW1pdHMgZm9ybWF0IGFzIHBhdGNoZXMgKHVzaW5nIGdpdCBm b3JtYXQtcGF0Y2ggSEVBRH5OKSIpe3xufCBAb3B0aW9uc1s6Zm9ybWF0X251bWJlcl09bn0K ICAgICAgb3B0cy5vbiggJy1EJywgIi0tZHJ5LXJ1biIsICJTaW11bGF0ZWQgcnVuICh3aXRo b3V0IGNvbW1pdHRpbmcgYW55dGhpbmchKSIgKXtAb3B0aW9uc1s6ZHJ5X3J1bl09dHJ1ZX0K ICAgICAgCiAgICAgIG9wdHMub24oICctaCcsICItLWhlbHAiLCAiUHJpbnQgdGhpcyBoZWxw IG1lc3NhZ2UgYW5kIGV4aXQiKXsKICAgICAgICB1c2FnZShvcHRzKQogICAgICAgIGV4aXQg MAogICAgICB9CiAgICAgIAogICAgICBvcHRzLnBhcnNlIShhcmdzKQogICAgICAKICAgICAg aWYgKCAhQG9wdGlvbnNbOnNvdXJjZV0gfHwgIUBvcHRpb25zWzp0YXJnZXRdICkKICAgICAg ICBwdXRzICJZb3UgbXVzdCBzcGVjaWZpZWQgYm90aCBpbnB1dCBBTkQgb3V0cHV0IGRpcmVj dG9yaWVzISIKICAgICAgICB1c2FnZShvcHRzKQogICAgICAgIGV4aXQgMQogICAgICBlbmQK ICAgIH0KICBlbmQgI2luaXQKICAKICBkZWYgdXNhZ2Uob3B0cykKICAgIHB1dHMgb3B0cy50 b19zCiAgICBwdXRzCiAgZW5kICN1c2FnZQogIAogIGRlZiBhcHBseQogICAgaWYgKCBAb3B0 aW9uc1s6Zm9ybWF0X251bWJlcl0gKQogICAgICBwdXRzICJHZW5lcmF0aW5nIHBhdGNoIGZp bGVzIGZyb20gbGF0ZXN0ICN7QG9wdGlvbnNbOmZvcm1hdF9udW1iZXJdfSBjb21taXRzIGlu ICN7QG9wdGlvbnNbOnNvdXJjZV19Li4uIgogICAgICBEaXIuY2hkaXIoIEBvcHRpb25zWzpz b3VyY2VdICl7CiAgICAgICAgZXhlYyggImdpdCBmb3JtYXQtcGF0Y2ggSEVBRH4je0BvcHRp b25zWzpmb3JtYXRfbnVtYmVyXX0iICkKICAgICAgfQogICAgZW5kCiAgICAKICAgIERpci5j aGRpciggQG9wdGlvbnNbOnRhcmdldF0gKSB7CiAgICAgIERpci5nbG9iKCBGaWxlLmpvaW4o IEBvcHRpb25zWzpzb3VyY2VdLCAiMDAqLnBhdGNoIiApICkuZWFjaCB7fGZ8CiAgICAgICAg bWVzc2FnZSA9ICIiCiAgICAgICAgbWVzc2FnZSA8PCAiWyN7QG9wdGlvbnNbOnN1YmplY3Rd fV0gIiBpZiBAb3B0aW9uc1s6c3ViamVjdF0KICAgICAgICAKICAgICAgICBpbl9zdWJqZWN0 ID0gZmFsc2UKICAgICAgICBGaWxlLm9wZW4oIGYgKSB7fGZpbGV8CiAgICAgICAgICBmaWxl LmVhY2hfbGluZSB7fGx8CiAgICAgICAgICAgIGxpbmUgPSBsLmNob21wCiAgICAgICAgICAg IGlmICggbGluZSA9fiAvU3ViamVjdDogXFtQQVRDSCBcZCtcL1xkK1xdICguKykvICkKICAg ICAgICAgICAgICBtZXNzYWdlIDw8ICQxCiAgICAgICAgICAgICAgaW5fc3ViamVjdCA9IHRy dWUKICAgICAgICAgICAgZWxzaWYgKCBpbl9zdWJqZWN0ICkKICAgICAgICAgICAgICBpZiAo IGxpbmUubGVuZ3RoIDwgMSApCiAgICAgICAgICAgICAgICBpbl9zdWJqZWN0ID0gZmFsc2UK ICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgcGFydCA9IGxpbmVbMS4uLTFdCiAgICAgICAgICAgICAgICBtZXNzYWdlIDw8ICIgIiA8 PCBwYXJ0CiAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAgIGVuZAogICAgICAgICAgfQog ICAgICAgIH0KICAgICAgICAKICAgICAgICBwdXRzICJcblxuRm91bmQgcGF0Y2g6ICN7Rmls ZS5iYXNlbmFtZShmKX0uXG5NZXNzYWdlOlxuXG5cdCN7bWVzc2FnZX1cblxuIgogICAgICAg IHB1dHMgIlBhdGNoIGNvbW1hbmQ6XG5cdHBhdGNoIC1wMSA8ICN7Zn0iCiAgICAgICAgaWYg KCAhcHJvbXB0KCAiQXBwbHkgdGhpcyBwYXRjaCBbWS9uXT8iLCB0cnVlKSApCiAgICAgICAg ICBleGl0IDIKICAgICAgICBlbmQKICAgICAgICAKICAgICAgICBwdXRzICJwYXRjaCAtcDEg PCAje2Z9IgogICAgICAgIGV4ZWMoICJwYXRjaCAtcDEgPCAje2Z9IiApCiAgICAgICAgCiAg ICAgICAgYHN2biBzdGF0dXMgfCBncmVwICdePycgfCBhd2sgJ3twcmludCAkMn0nYC5lYWNo X2xpbmUge3xsaW5lfAogICAgICAgICAgcGF0aCA9IGxpbmUuY2hvbXAKICAgICAgICAgIGV4 ZWMoICJzdm4gYWRkICN7cGF0aH0iICkKICAgICAgICB9CiAgICAgICAgCiAgICAgICAgcHV0 cyAiQWNjb3VudGluZyBmb3IgZmlsZXMgcmVtb3ZlZCBmcm9tIFNWTjoiCiAgICAgICAgYHN2 biBzdGF0dXMgfCBncmVwICchJyB8IGF3ayAne3ByaW50ICQyfSdgLmVhY2hfbGluZSB7fGxp bmV8CiAgICAgICAgICBwYXRoID0gbGluZS5jaG9tcAogICAgICAgICAgZXhlYyggInN2biBy bSAtLWZvcmNlICN7cGF0aH0iICkKICAgICAgICB9CiAgICAgICAgCiAgICAgICAgcHV0cyAi XG5cblxuXG5cbkN1cnJlbnQgU1ZOIHN0YXR1czoiCiAgICAgICAgZXhlYyggInN2biBzdGF0 dXMiICkKICAgICAgICBwdXRzICJcblxuIgogICAgICAgIAogICAgICAgIG1lc3NhZ2VfZmls ZSA9IFRlbXBmaWxlLm5ldyggInN2bi1jb21taXQiICkKICAgICAgICBtZXNzYWdlX2ZpbGUg PDwgbWVzc2FnZQogICAgICAgIG1lc3NhZ2VfZmlsZS5mbHVzaAogICAgICAgIAogICAgICAg IG1lc3NhZ2VfZmlsZV9wYXRoID0gbWVzc2FnZV9maWxlLnBhdGgKICAgICAgICBwdXRzICJT Vk4gY29tbWl0IGNvbW1hbmQ6XG5cbnN2biBjaSAtRiAje21lc3NhZ2VfZmlsZV9wYXRofVxu TWVzc2FnZSBmaWxlIGNvbnRlbnRzOlxuXG4je0ZpbGUucmVhZChtZXNzYWdlX2ZpbGVfcGF0 aCl9XG5cbiIKICAgICAgICBpZiAoICFwcm9tcHQoICJDb21taXQgdGhpcyBwYXRjaCBbeS9O XT8iLCBmYWxzZSApICkKICAgICAgICAgIGV4aXQgMwogICAgICAgIGVuZAogICAgICAgIAog ICAgICAgIHB1dHMgInN2biBjaSAtRiAnI3ttZXNzYWdlX2ZpbGVfcGF0aH0nIgogICAgICAg IGV4ZWMoICJzdm4gY2kgLUYgJyN7bWVzc2FnZV9maWxlX3BhdGh9JyIgKSB1bmxlc3MgQG9w dGlvbnNbOmRyeV9ydW5dCiAgICAgIH0KICAgIH0KICAgIAogICAgaWYgKCBAb3B0aW9uc1s6 Zm9ybWF0X251bWJlcl0gKQogICAgICBwdXRzICJDbGVhbmluZyB1cCBnZW5lcmF0ZWQgcGF0 Y2ggZmlsZXMgaW4gI3tAb3B0aW9uc1s6c291cmNlXX0uLi4iCiAgICAgIERpci5jaGRpcigg QG9wdGlvbnNbOnNvdXJjZV0gKXsKICAgICAgICBleGVjKCAicm0gLXYgMDAqLnBhdGNoIiAp CiAgICAgIH0KICAgIGVuZAogICAgCiAgZW5kCiAgCiAgZGVmIGV4ZWMoIGNvbW1hbmQgKQog ICAgc3lzdGVtKCBjb21tYW5kICkKICAgIHJldCA9ICQ/CiAgICBleGl0IHJldCB1bmxlc3Mg cmV0ID09IDAKICBlbmQKICAKICBkZWYgcHJvbXB0KCBtZXNzYWdlLCBkZWZhdWx0PW5pbCAp CiAgICByZXNwb25zZSA9IG5pbAogICAgYmVnaW4KICAgICAgU1RET1VULnByaW50IG1lc3Nh Z2UKICAgICAgcmVzcG9uc2UgPSBTVERJTi5nZXRzLmNob21wCiAgICAgIGlmICggZGVmYXVs dCAhPSBuaWwgJiYgKCAhcmVzcG9uc2UgfHwgcmVzcG9uc2UubGVuZ3RoIDwgMSApICkKICAg ICAgICByZXNwb25zZSA9IGRlZmF1bHQKICAgICAgICBicmVhawogICAgICBlbHNpZiAoIHJl c3BvbnNlID1+IC8oKFtUdF1bUnJdW1V1XVtFZV0pfChbWXldKFtFZV1bU3NdKT8pKS8gKQog ICAgICAgIHJlc3BvbnNlID0gdHJ1ZQogICAgICBlbHNpZiAoIHJlc3BvbnNlID1+IC8oKFtG Zl1bQWFdW0xzXVtTc11bRWVdKXwoW05uXShbT29dKT8pKS8gKQogICAgICAgIHJlc3BvbnNl ID0gZmFsc2UKICAgICAgZWxzZQogICAgICAgIHB1dHMgIkludmFsaWQgcmVzcG9uc2UuIgog ICAgICAgIHJlc3BvbnNlID0gbmlsCiAgICAgIGVuZAogICAgZW5kIHdoaWxlIHJlc3BvbnNl ID09IG5pbAogICAgCiAgICByZXNwb25zZQogIGVuZAogIAplbmQgI2NsYXNzCgpHaXQyU3Zu UGF0Y2hlci5uZXcoQVJHVikuYXBwbHk= --------------040404050202030005000300 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org For additional commands, e-mail: dev-help@maven.apache.org --------------040404050202030005000300--