From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sverre Hvammen Johansen" Subject: [RFC/PATCH] Merge strategy single Date: Tue, 22 Jan 2008 00:33:25 -0800 Message-ID: <402c10cd0801220033x764f0f80g9b0516927e6e591e@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_14567_746071.1200990805261" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jan 22 09:34:02 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JHEa0-0008QT-0r for gcvg-git-2@gmane.org; Tue, 22 Jan 2008 09:34:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755462AbYAVId3 (ORCPT ); Tue, 22 Jan 2008 03:33:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755417AbYAVId3 (ORCPT ); Tue, 22 Jan 2008 03:33:29 -0500 Received: from fk-out-0910.google.com ([209.85.128.191]:19692 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755404AbYAVId1 (ORCPT ); Tue, 22 Jan 2008 03:33:27 -0500 Received: by fk-out-0910.google.com with SMTP id z23so1647313fkz.5 for ; Tue, 22 Jan 2008 00:33:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type; bh=br2fSPiaMxSa58cUL4H+LXAFwh4DYHGfTrBhhR1vOvo=; b=K+vSbHu75XYtAmjnSCaqm3rniRPU3cPNAUHf1awPHx/ZRy0zIb2f6HpuwbJXY/zwhWn3oZKveNk90uS/e28Y6sD5kv8KIXIo12RgXXV0KGV0MRk/Xcg74XS5ksS+0TTOIY1YLum8vYQTXCBJuYqiEUre3VbOyAGGY79MR+gM+aw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type; b=kfAYwgxwudpQtWKorni9YpydhzeR9/XNExAVepFLQRYFBN0bTmDnezmaLCIW6N5zW9Pe+NjW6CJsMyrXbiSeDd5ZOY327m8L8Bd58phYmS7DlzXwbKCvxODAO8aUDcM8aNTsWAnCkn+IZUlhvISJD+uEjurj5FYirpwWr2xIhJc= Received: by 10.82.174.20 with SMTP id w20mr14240752bue.21.1200990805264; Tue, 22 Jan 2008 00:33:25 -0800 (PST) Received: by 10.82.172.18 with HTTP; Tue, 22 Jan 2008 00:33:25 -0800 (PST) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: ------=_Part_14567_746071.1200990805261 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline A patch for this feature is attached. I intend to write more tests for this patch next weekend. Any comments are welcome. -- Sverre Hvammen Johansen ------=_Part_14567_746071.1200990805261 Content-Type: text/x-patch; name=0001-Merge-strategy-single.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fbq6us2b0 Content-Disposition: attachment; filename=0001-Merge-strategy-single.patch RnJvbSAxMjgzZjVlYTE3YjQ5M2E5MjI0ZmE3YTY1YmIyMzM5NjJiYzllYTQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8c2pAYmxhY2subG9j YWw+CkRhdGU6IFR1ZSwgMjIgSmFuIDIwMDggMDA6Mjk6MzcgLTA4MDAKU3ViamVjdDogW1BBVENI XSBNZXJnZSBzdHJhdGVneSBzaW5nbGUKCkEgbmV3IG1lcmdlIHN0cmF0ZWd5LCBzaW5nbGUgaXMg aW50cm9kdWNlcy4gIFRoaXMgbWVyZ2UKc3RyYXRlZ3kgZmFpbHMgaWYgdGhlIHNwZWNpZmllZCBo ZWFkcyBhbmQgSEVBRCBjYW4gbm90CmJlIHJlZHVjZWQgZG93biB0byBvbmx5IG9uZSByZWFsIHBh cmVudC4gIFRoZSBvbmx5IGFsbG93ZWQKb3V0Y29tZSBpcyBhIGZhc3QgZm9yd2FyZCB1bmxlc3Mg SEVBRCBpcyB1cCB0byBkYXRlIHdpdGgKdGhlIHNwZWNpZmllZCBoZWFkcy4KClRoaXMgcGF0Y2gg YWxzbyB1c2VzIHRoZSByZWFsIGhlYWRzIGZvdW5kIGluc3RlYWQgb2YgdGhvc2UKc3BlY2lmaWVk IGZvciByZWFsIG1lcmdlcy4gIFRoaXMgbWVhbnMgdGhhdCBtZXJnZSBzdGFydGVnaWVzCnRoYXQg b25seSB0YWtlIHR3byBoZWFkcyBjYW4gbm93IGFjY2VwdCBtb3JlIHRoYW4gdHdvIGhlYWRzCmlm IHRoZXkgY2FuIGJlIHJlZHVjZWQgZG93biB0byBvbmx5IHR3byByZWFsIGhlYWRzLgoKS25vd24g aXNzdWVzOiAgTW9yZSB0ZXN0cyBhcmUgbmVlZGVkLiAgQWRkIGRvY3VtZW50YXRpb24uCkJldHRl ciBoYW5kbGluZyBvZiBmYXN0IGZvcndhcmQgb2YgSEVBRCB3aGVuIGRvaW5nIHJlYWwgbWVyZ2Uu CgpTaWduZWQtb2ZmLWJ5OiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFpbC5j b20+Ci0tLQogZ2l0LW1lcmdlLnNoICAgICB8ICAyMzggKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiB0L3Q3NjAwLW1lcmdlLnNoIHwgIDE3MiAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwg MzMyIGluc2VydGlvbnMoKyksIDc4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dpdC1tZXJn ZS5zaCBiL2dpdC1tZXJnZS5zaAppbmRleCAxYzEyM2EzLi41N2YyZjAwIDEwMDc1NQotLS0gYS9n aXQtbWVyZ2Uuc2gKKysrIGIvZ2l0LW1lcmdlLnNoCkBAIC0yOCw3ICsyOCw3IEBAIHRlc3QgLXog IiQoZ2l0IGxzLWZpbGVzIC11KSIgfHwKIExGPScKICcKIAotYWxsX3N0cmF0ZWdpZXM9J3JlY3Vy IHJlY3Vyc2l2ZSBvY3RvcHVzIHJlc29sdmUgc3R1cGlkIG91cnMgc3VidHJlZScKK2FsbF9zdHJh dGVnaWVzPSdzaW5nbGUgcmVjdXIgcmVjdXJzaXZlIG9jdG9wdXMgcmVzb2x2ZSBzdHVwaWQgb3Vy cyBzdWJ0cmVlJwogZGVmYXVsdF90d29oZWFkX3N0cmF0ZWdpZXM9J3JlY3Vyc2l2ZScKIGRlZmF1 bHRfb2N0b3B1c19zdHJhdGVnaWVzPSdvY3RvcHVzJwogbm9fZmFzdF9mb3J3YXJkX3N0cmF0ZWdp ZXM9J3N1YnRyZWUgb3VycycKQEAgLTE2Nyw3ICsxNjcsMTIgQEAgcGFyc2VfY29uZmlnICgpIHsK IAkJCXNoaWZ0CiAJCQljYXNlICIgJGFsbF9zdHJhdGVnaWVzICIgaW4KIAkJCSoiICQxICIqKQot CQkJCXVzZV9zdHJhdGVnaWVzPSIkdXNlX3N0cmF0ZWdpZXMkMSAiIDs7CisJCQkJaWYgdGVzdCAi JHVzZV9zdHJhdGVnaWVzIiA9IHNpbmdsZSAtbyAiJDEiID0gc2luZ2xlIC1vIC16ICIkdXNlX3N0 cmF0ZWdpZXMiCisJCQkJdGhlbgorCQkJCQl1c2Vfc3RyYXRlZ2llcz0iJDEiCisJCQkJZWxzZQor CQkJCQl1c2Vfc3RyYXRlZ2llcz0iJHVzZV9zdHJhdGVnaWVzICQxIgorCQkJCWZpIDs7CiAJCQkq KQogCQkJCWRpZSAiYXZhaWxhYmxlIHN0cmF0ZWdpZXMgYXJlOiAkYWxsX3N0cmF0ZWdpZXMiIDs7 CiAJCQllc2FjCkBAIC0yNzQsMjQgKzI3OSwxMTMgQEAgZG8KIGRvbmUKIHNldCB4ICRyZW1vdGVo ZWFkcyA7IHNoaWZ0CiAKK2VjaG8gIiRoZWFkIiA+IiRHSVRfRElSL09SSUdfSEVBRCIKKworZmlu ZF9vbmVfcmVhbF9wYXJlbnQgKCkgeworCSMgVGhlIHJlYWwgcGFyZW50IGNhbmRpZGF0ZQorCXJl YWxfcGFyZW50PSQxCisJc2hpZnQKKworCSMgT3RoZXIgcGFyZW50cyB0aGF0IGFyZSBpbmRlcGVu dCBvZiB0aGUgcmVhbCBwYXJlbnQgY2FuZGlkYXRlCisJb3RoZXJfcGFyZW50cz0KKworCSMgUGFy ZW50cyB0aGF0IG5lZWQgZnVydGhlciBwcm9jZXNzaW5nIHRvIGRldGVybWluZSB3aGV0aGVyCisJ IyB0aGV5IGFyZSBpbmRlcGVuZGVudCBwYXJlbnRzIG9mIHRoZSBwYXJlbnQgY2FuZGlkYXRlIG9y IG5vdAorCXBhcmVudHNfeD0KKworCXdoaWxlIHRlc3QgJCMgLWd0IDAKKwlkbworCQlpZiB0ZXN0 ICRyZWFsX3BhcmVudCA9ICQxCisJCXRoZW4KKwkJCSMgRm91bmQgYSBwYXJlbnQgdGhhdCBpcyBl cXVhbCB0byB0aGUgcmVhbAorCQkJIyBwYXJlbnQgY2FuZGlkYXRlCisJCQllY2hvICJEdXBsaWNh dGUgJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJDEpIgorCQllbHNlCisJCQljb21tb25fYj0kKGdp dCBtZXJnZS1iYXNlIC0tYWxsICRyZWFsX3BhcmVudCAkMSkKKwkJCisJCQlpZiB0ZXN0ICRjb21t b25fYiA9ICQxCisJCQl0aGVuCisJCQkJIyBGb3VuZCBhIHBhcmVudCB0aGF0IGlzIG5vdAorCQkJ CSMgaW5kZXBlbmRlbnQgb2YgdGhlIHJlYWwgcGFyZW50CisJCQkJIyBjYW5kaWRhdGUKKwkJCQll Y2hvICJQb3NzaWJsZSBmZiAkKGdpdCByZXYtcGFyc2UgLS1zaG9ydCAkMSkuLiQoZ2l0IHJldi1w YXJzZSAtLXNob3J0ICRyZWFsX3BhcmVudCkuIgorCQkJZWxpZiB0ZXN0ICRjb21tb25fYiA9ICRy ZWFsX3BhcmVudAorCQkJdGhlbgorCQkJCSMgRm91bmQgYSBiZXR0ZXIgcmVhbCBwYXJlbnQgY2Fu ZGlkYXRlCisJCQkJZWNobyAiUG9zc2libGUgZmYgJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJHJl YWxfcGFyZW50KS4uJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJDEpLiIKKwkJCQlyZWFsX3BhcmVu dD0kMQorCQkJCXBhcmVudHNfeD0iJG90aGVyX3BhcmVudHMiCisJCQkJb3RoZXJfcGFyZW50cz0K KwkJCWVsc2UKKwkJCQkjIEZvdW5kIGEgcGFyZW50IHRoYXQgaXMgaW5kZXBlbmRlbnQKKwkJCQkj IG9mIHRoZSByZWFsIHBhcmVudCBjYW5kaWRhdGUKKwkJCQlvdGhlcl9wYXJlbnRzPSIkb3RoZXJf cGFyZW50cyAkMSIKKwkJCWZpCisJCWZpCisJCXNoaWZ0CisJZG9uZQorCisJIyBXZSBoYXZlIGEg cmVhbCBwYXJlbnQsIHNvbWUgcGFyZW50cyB3ZSBrbm93IGlzIGluZGVwZW5kdCBvZgorCSMgdGhp cyByZWFsIHBhcmVudCwgYW5kIHNvbWUgcGFyZW50cyB0aGF0IG5lZWQgZnVydGhlcgorCSMgcHJv Y2Vzc2luZy4KKworCWZvciBiIGluICRwYXJlbnRzX3gKKwlkbworCQljb21tb25fYj0kKGdpdCBt ZXJnZS1iYXNlIC0tYWxsICRmaXJzdF9wYXJlbnQgJGIpCisJCWlmIHRlc3QgJGNvbW1vbl9iICE9 ICRiCisJCXRoZW4KKwkJCW90aGVyX3BhcmVudHM9IiRvdGhlcl9wYXJlbnRzICRiIgorCQlmaQor CWRvbmUKKworCSMgV2UgaGF2ZSBhIHJlYWwgcGFyZW50IGFuZCBvdGhlciBwYXJlbnRzIHdlIGtu b3cgaXMgaW5kZXBlbmR0CisJIyBvZiB0aGlzIHJlYWwgcGFyZW50Cit9CisKK2ZpbmRfcmVhbF9w YXJlbnRzICgpIHsKKyAgICBmaW5kX29uZV9yZWFsX3BhcmVudCAkaGVhZCAiJEAiCisgICAgZmZf aGVhZD0kcmVhbF9wYXJlbnQKKyAgICByZWFsX3BhcmVudHM9CisKKyAgICB3aGlsZSB0ZXN0IC1u ICIkb3RoZXJfcGFyZW50cyIKKyAgICBkbworCWZpbmRfb25lX3JlYWxfcGFyZW50ICRvdGhlcl9w YXJlbnRzCisJcmVhbF9wYXJlbnRzPSIkcmVhbF9wYXJlbnRzICRyZWFsX3BhcmVudCIKKyAgICBk b25lCit9CisKK2ZpbmRfcmVhbF9wYXJlbnRzICIkQCIKKworaWYgdGVzdCAtbiAiJHJlYWxfcGFy ZW50cyIgLWEgIiR1c2Vfc3RyYXRlZ2llcyIgIT0gc2luZ2xlIC1hICRoZWFkICE9ICRmZl9oZWFk Cit0aGVuCisJIyBXZSBjdXJyZW50bHkgZG9uJ3QgaGFuZGxlIGZmX2hlYWQKKwlpZiB0ZXN0IC1u ICIkcmVhbF9wYXJlbnRzIgorCXRoZW4KKwkJcmVhbF9wYXJlbnRzPSIkZmZfaGVhZCAkcmVhbF9w YXJlbnRzIgorCWVsc2UKKwkJcmVhbF9wYXJlbnRzPSRmZl9oZWFkCisJZmkJCisJZmZfaGVhZD0k aGVhZAorZmkKKwogY2FzZSAiJHVzZV9zdHJhdGVnaWVzIiBpbgogJycpCi0JY2FzZSAiJCMiIGlu Ci0JMSkKLQkJdmFyPSJgZ2l0IGNvbmZpZyAtLWdldCBwdWxsLnR3b2hlYWRgIgorCWNhc2UgIiRy ZWFsX3BhcmVudHMiIGluCisJPyoiICI/KikKKwkJdmFyPSJgZ2l0IGNvbmZpZyAtLWdldCBwdWxs Lm9jdG9wdXNgIgogCQlpZiB0ZXN0IC1uICIkdmFyIgogCQl0aGVuCiAJCQl1c2Vfc3RyYXRlZ2ll cz0iJHZhciIKIAkJZWxzZQotCQkJdXNlX3N0cmF0ZWdpZXM9IiRkZWZhdWx0X3R3b2hlYWRfc3Ry YXRlZ2llcyIKKwkJCXVzZV9zdHJhdGVnaWVzPSIkZGVmYXVsdF9vY3RvcHVzX3N0cmF0ZWdpZXMi CiAJCWZpIDs7CiAJKikKLQkJdmFyPSJgZ2l0IGNvbmZpZyAtLWdldCBwdWxsLm9jdG9wdXNgIgor CQl2YXI9ImBnaXQgY29uZmlnIC0tZ2V0IHB1bGwudHdvaGVhZGAiCiAJCWlmIHRlc3QgLW4gIiR2 YXIiCiAJCXRoZW4KIAkJCXVzZV9zdHJhdGVnaWVzPSIkdmFyIgogCQllbHNlCi0JCQl1c2Vfc3Ry YXRlZ2llcz0iJGRlZmF1bHRfb2N0b3B1c19zdHJhdGVnaWVzIgorCQkJdXNlX3N0cmF0ZWdpZXM9 IiRkZWZhdWx0X3R3b2hlYWRfc3RyYXRlZ2llcyIKIAkJZmkgOzsKIAllc2FjCiAJOzsKQEAgLTMx OSw4NyArNDEzLDc1IEBAIGRvCiAJZG9uZQogZG9uZQogCi1jYXNlICIkIyIgaW4KLTEpCi0JY29t bW9uPSQoZ2l0IG1lcmdlLWJhc2UgLS1hbGwgJGhlYWQgIiRAIikKLQk7OwotKikKLQljb21tb249 JChnaXQgc2hvdy1icmFuY2ggLS1tZXJnZS1iYXNlICRoZWFkICIkQCIpCi0JOzsKLWVzYWMKLWVj aG8gIiRoZWFkIiA+IiRHSVRfRElSL09SSUdfSEVBRCIKLQotY2FzZSAiJGFsbG93X2Zhc3RfZm9y d2FyZCwkIywkY29tbW9uLCRub19jb21taXQiIGluCi0/LCosJycsKikKLQkjIE5vIGNvbW1vbiBh bmNlc3RvcnMgZm91bmQuIFdlIG5lZWQgYSByZWFsIG1lcmdlLgotCTs7Ci0/LDEsIiQxIiwqKQot CSMgSWYgaGVhZCBjYW4gcmVhY2ggYWxsIHRoZSBtZXJnZSB0aGVuIHdlIGFyZSB1cCB0byBkYXRl LgotCSMgYnV0IGZpcnN0IHRoZSBtb3N0IGNvbW1vbiBjYXNlIG9mIG1lcmdpbmcgb25lIHJlbW90 ZS4KK2lmIHRlc3QgLW4gIiRyZWFsX3BhcmVudHMiCit0aGVuCisJaWYgdGVzdCAiJHVzZV9zdHJh dGVnaWVzIiA9IHNpbmdsZQorCXRoZW4KKwkJZGllICJNZXJnZSBzdHJhdGVneSBzaW5nbGUgY2Fu IG5vdCBoYW5kbGUgbW9yZSB0aGFuIG9uZSByZWFsIHBhcmVudCIKKwlmaQorZWxpZiB0ZXN0ICRo ZWFkID0gJGZmX2hlYWQKK3RoZW4KIAlmaW5pc2hfdXBfdG9fZGF0ZSAiQWxyZWFkeSB1cC10by1k YXRlLiIKIAlleGl0IDAKLQk7OwotdCwxLCIkaGVhZCIsKikKLQkjIEFnYWluIHRoZSBtb3N0IGNv bW1vbiBjYXNlIG9mIG1lcmdpbmcgb25lIHJlbW90ZS4KLQllY2hvICJVcGRhdGluZyAkKGdpdCBy ZXYtcGFyc2UgLS1zaG9ydCAkaGVhZCkuLiQoZ2l0IHJldi1wYXJzZSAtLXNob3J0ICQxKSIKK2Vs aWYgdGVzdCAkYWxsb3dfZmFzdF9mb3J3YXJkID0gdAordGhlbgorCWVjaG8gIlVwZGF0aW5nICQo Z2l0IHJldi1wYXJzZSAtLXNob3J0ICRoZWFkKS4uJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJGZm X2hlYWQpIgogCWdpdCB1cGRhdGUtaW5kZXggLS1yZWZyZXNoIDI+L2Rldi9udWxsCiAJbXNnPSJG YXN0IGZvcndhcmQiCiAJaWYgdGVzdCAtbiAiJGhhdmVfbWVzc2FnZSIKIAl0aGVuCiAJCW1zZz0i JG1zZyAobm8gY29tbWl0IGNyZWF0ZWQ7IC1tIG9wdGlvbiBpZ25vcmVkKSIKIAlmaQotCW5ld19o ZWFkPSQoZ2l0IHJldi1wYXJzZSAtLXZlcmlmeSAiJDFeMCIpICYmCisJbmV3X2hlYWQ9JChnaXQg cmV2LXBhcnNlIC0tdmVyaWZ5ICIkZmZfaGVhZF4wIikgJiYKIAlnaXQgcmVhZC10cmVlIC12IC1t IC11IC0tZXhjbHVkZS1wZXItZGlyZWN0b3J5PS5naXRpZ25vcmUgJGhlYWQgIiRuZXdfaGVhZCIg JiYKIAlmaW5pc2ggIiRuZXdfaGVhZCIgIiRtc2ciIHx8IGV4aXQKIAlkcm9wc2F2ZQogCWV4aXQg MAotCTs7Ci0/LDEsPyoiJExGIj8qLCopCi0JIyBXZSBhcmUgbm90IGRvaW5nIG9jdG9wdXMgYW5k IG5vdCBmYXN0IGZvcndhcmQuICBOZWVkIGEKLQkjIHJlYWwgbWVyZ2UuCi0JOzsKLT8sMSwqLCkK LQkjIFdlIGFyZSBub3QgZG9pbmcgb2N0b3B1cywgbm90IGZhc3QgZm9yd2FyZCwgYW5kIGhhdmUg b25seQotCSMgb25lIGNvbW1vbi4KLQlnaXQgdXBkYXRlLWluZGV4IC0tcmVmcmVzaCAyPi9kZXYv bnVsbAotCWNhc2UgIiRhbGxvd190cml2aWFsX21lcmdlIiBpbgotCXQpCi0JCSMgU2VlIGlmIGl0 IGlzIHJlYWxseSB0cml2aWFsLgotCQlnaXQgdmFyIEdJVF9DT01NSVRURVJfSURFTlQgPi9kZXYv bnVsbCB8fCBleGl0Ci0JCWVjaG8gIlRyeWluZyByZWFsbHkgdHJpdmlhbCBpbi1pbmRleCBtZXJn ZS4uLiIKLQkJaWYgZ2l0IHJlYWQtdHJlZSAtLXRyaXZpYWwgLW0gLXUgLXYgJGNvbW1vbiAkaGVh ZCAiJDEiICYmCi0JCSAgIHJlc3VsdF90cmVlPSQoZ2l0IHdyaXRlLXRyZWUpCi0JCXRoZW4KLQkJ CWVjaG8gIldvbmRlcmZ1bC4iCi0JCQlyZXN1bHRfY29tbWl0PSQoCi0JCQkJcHJpbnRmICclc1xu JyAiJG1lcmdlX21zZyIgfAotCQkJCWdpdCBjb21taXQtdHJlZSAkcmVzdWx0X3RyZWUgLXAgSEVB RCAtcCAiJDEiCi0JCQkpIHx8IGV4aXQKLQkJCWZpbmlzaCAiJHJlc3VsdF9jb21taXQiICJJbi1p bmRleCBtZXJnZSIKLQkJCWRyb3BzYXZlCi0JCQlleGl0IDAKLQkJZmkKLQkJZWNobyAiTm9wZS4i Ci0JZXNhYwotCTs7Ci0qKQotCSMgQW4gb2N0b3B1cy4gIElmIHdlIGNhbiByZWFjaCBhbGwgdGhl IHJlbW90ZSB3ZSBhcmUgdXAgdG8gZGF0ZS4KLQl1cF90b19kYXRlPXQKLQlmb3IgcmVtb3RlCi0J ZG8KLQkJY29tbW9uX29uZT0kKGdpdCBtZXJnZS1iYXNlIC0tYWxsICRoZWFkICRyZW1vdGUpCi0J CWlmIHRlc3QgIiRjb21tb25fb25lIiAhPSAiJHJlbW90ZSIKLQkJdGhlbgotCQkJdXBfdG9fZGF0 ZT1mCi0JCQlicmVhawotCQlmaQotCWRvbmUKLQlpZiB0ZXN0ICIkdXBfdG9fZGF0ZSIgPSB0Citl bHNlCisJaWYgdGVzdCAiJHVzZV9zdHJhdGVnaWVzIiA9ICJzaW5nbGUiCiAJdGhlbgotCQlmaW5p c2hfdXBfdG9fZGF0ZSAiQWxyZWFkeSB1cC10by1kYXRlLiBZZWVhaCEiCi0JCWV4aXQgMAorCQlk aWUgIk1lcmdlIHN0cmF0ZWd5IHNpbmdsZSBjYW4gbm90IGZhc3QgZm9yd2FyZCB3aGVuIC0tbm8t ZmYgaXMgc3BlY2lmaWVkIgorCWVsc2UKKwkJcmVhbF9wYXJlbnRzPSRmZl9oZWFkCisJCWZmX2hl YWQ9JGhlYWQKIAlmaQorZmkKKworY2FzZSAiJHJlYWxfcGFyZW50cyIgaW4KKz8qIiAiPyopCisJ IyBXZSBoYXZlIG1vcmUgdGhhbiBvbmUgcGFyZW50CisJY29tbW9uPSQoZ2l0IHNob3ctYnJhbmNo IC0tbWVyZ2UtYmFzZSAkaGVhZCAkcmVhbF9wYXJlbnRzKQogCTs7CisqKQorCSMgV2UgaGF2ZSBl eGFjdGx5IG9uZSBwYXJlbnQKKwljb21tb249JChnaXQgbWVyZ2UtYmFzZSAtLWFsbCAkZmZfaGVh ZCAkcmVhbF9wYXJlbnRzKQorCWNhc2UgIiRjb21tb24iIGluCisJPyoiJExGIj8qKQorCQkjIFdl IGFyZSBub3QgZG9pbmcgb2N0b3B1cyBhbmQgbm90IGZhc3QgZm9yd2FyZC4gIE5lZWQgYQorCQkj IHJlYWwgbWVyZ2UuCisJCTs7CisJKikKKwkJZ2l0IHVwZGF0ZS1pbmRleCAtLXJlZnJlc2ggMj4v ZGV2L251bGwKKwkJaWYgdGVzdCAiJGFsbG93X3RyaXZpYWxfbWVyZ2UiID0gdAorCQl0aGVuCisJ CQkjIFNlZSBpZiBpdCBpcyByZWFsbHkgdHJpdmlhbC4KKwkJCWdpdCB2YXIgR0lUX0NPTU1JVFRF Ul9JREVOVCA+L2Rldi9udWxsIHx8IGV4aXQKKwkJCWVjaG8gIlRyeWluZyByZWFsbHkgdHJpdmlh bCBpbi1pbmRleCBtZXJnZS4uLiIKKwkJCWlmIGdpdCByZWFkLXRyZWUgLS10cml2aWFsIC1tIC11 IC12ICRjb21tb24gJGhlYWQgJHJlYWxfcGFyZW50cyAmJgorCQkJCXJlc3VsdF90cmVlPSQoZ2l0 IHdyaXRlLXRyZWUpCisJCQl0aGVuCisJCQkJZWNobyAiV29uZGVyZnVsLiIKKwkJCQlyZXN1bHRf Y29tbWl0PSQoCisJCQkJCXByaW50ZiAnJXNcbicgIiRtZXJnZV9tc2ciIHwKKwkJCQkJZ2l0IGNv bW1pdC10cmVlICRyZXN1bHRfdHJlZSAtcCBIRUFEIC1wICRyZWFsX3BhcmVudHMKKwkJCQkpIHx8 IGV4aXQKKwkJCQlmaW5pc2ggIiRyZXN1bHRfY29tbWl0IiAiSW4taW5kZXggbWVyZ2UiCisJCQkJ ZHJvcHNhdmUKKwkJCQlleGl0IDAKKwkJCWZpCisJCQllY2hvICJOb3BlLiIKKwkJZmkgOzsKKwll c2FjIDs7CiBlc2FjCiAKICMgV2UgYXJlIGdvaW5nIHRvIG1ha2UgYSBuZXcgY29tbWl0LgpAQCAt NDQwLDcgKzUyMiw3IEBAIGRvCiAgICAgIyBSZW1lbWJlciB3aGljaCBzdHJhdGVneSBsZWZ0IHRo ZSBzdGF0ZSBpbiB0aGUgd29ya2luZyB0cmVlCiAgICAgd3Rfc3RyYXRlZ3k9JHN0cmF0ZWd5CiAK LSAgICBnaXQtbWVyZ2UtJHN0cmF0ZWd5ICRjb21tb24gLS0gIiRoZWFkX2FyZyIgIiRAIgorICAg IGdpdC1tZXJnZS0kc3RyYXRlZ3kgJGNvbW1vbiAtLSAiJGhlYWRfYXJnIiAkcmVhbF9wYXJlbnRz CiAgICAgZXhpdD0kPwogICAgIGlmIHRlc3QgIiRub19jb21taXQiID0gdCAmJiB0ZXN0ICIkZXhp dCIgPSAwCiAgICAgdGhlbgpAQCAtNDc4LDkgKzU2MCw5IEBAIGlmIHRlc3QgJycgIT0gIiRyZXN1 bHRfdHJlZSIKIHRoZW4KICAgICBpZiB0ZXN0ICIkYWxsb3dfZmFzdF9mb3J3YXJkIiA9ICJ0Igog ICAgIHRoZW4KLSAgICAgICAgcGFyZW50cz0kKGdpdCBzaG93LWJyYW5jaCAtLWluZGVwZW5kZW50 ICIkaGVhZCIgIiRAIikKKyAgICAgICAgcGFyZW50cz0kKGdpdCBzaG93LWJyYW5jaCAtLWluZGVw ZW5kZW50ICIkaGVhZCIgJHJlYWxfcGFyZW50cykKICAgICBlbHNlCi0gICAgICAgIHBhcmVudHM9 JChnaXQgcmV2LXBhcnNlICIkaGVhZCIgIiRAIikKKyAgICAgICAgcGFyZW50cz0kKGdpdCByZXYt cGFyc2UgIiRoZWFkIiAkcmVhbF9wYXJlbnRzKQogICAgIGZpCiAgICAgcGFyZW50cz0kKGVjaG8g IiRwYXJlbnRzIiB8IHNlZCAtZSAncy9eLy1wIC8nKQogICAgIHJlc3VsdF9jb21taXQ9JChwcmlu dGYgJyVzXG4nICIkbWVyZ2VfbXNnIiB8IGdpdCBjb21taXQtdHJlZSAkcmVzdWx0X3RyZWUgJHBh cmVudHMpIHx8IGV4aXQKQEAgLTUxMCw3ICs1OTIsNyBAQCBjYXNlICIkYmVzdF9zdHJhdGVneSIg aW4KIAllY2hvICJSZXdpbmRpbmcgdGhlIHRyZWUgdG8gcHJpc3RpbmUuLi4iCiAJcmVzdG9yZXN0 YXRlCiAJZWNobyAiVXNpbmcgdGhlICRiZXN0X3N0cmF0ZWd5IHRvIHByZXBhcmUgcmVzb2x2aW5n IGJ5IGhhbmQuIgotCWdpdC1tZXJnZS0kYmVzdF9zdHJhdGVneSAkY29tbW9uIC0tICIkaGVhZF9h cmciICIkQCIKKwlnaXQtbWVyZ2UtJGJlc3Rfc3RyYXRlZ3kgJGNvbW1vbiAtLSAiJGhlYWRfYXJn IiAkcmVhbF9wYXJlbnRzCiAJOzsKIGVzYWMKIApkaWZmIC0tZ2l0IGEvdC90NzYwMC1tZXJnZS5z aCBiL3QvdDc2MDAtbWVyZ2Uuc2gKaW5kZXggNTBjNTFjOC4uZmUwMTk0MSAxMDA3NTUKLS0tIGEv dC90NzYwMC1tZXJnZS5zaAorKysgYi90L3Q3NjAwLW1lcmdlLnNoCkBAIC01Nyw2ICs1NywxOCBA QCBjYXQgPmZpbGUuOSA8PEVPRgogOSBYCiBFT0YKIAorY2F0ICA+cmVzdWx0LjAgPDxFT0YKKzEK KzIKKzMKKzQKKzUKKzYKKzcKKzgKKzkKK0VPRgorCiBjYXQgID5yZXN1bHQuMSA8PEVPRgogMSBY CiAyCkBAIC00MzcsNCArNDQ5LDE2NCBAQCB0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMCB3 aXRoIGMxIChmZiBvdmVycmlkZXMgbm8tZmYpJyAnCiAKIHRlc3RfZGVidWcgJ2dpdGsgLS1hbGwn CiAKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMwIHdpdGggYzEgKC1zIHNpbmdsZSBpbiBj b25maWcpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMCAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1h c3Rlci5tZXJnZW9wdGlvbnMgIi1zIHNpbmdsZSIgJiYKKwlnaXQgbWVyZ2UgYzEgJiYKKwl0ZXN0 X3RpY2sgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRj MQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdt ZXJnZSBjMSB3aXRoIGMwICgtLXN0cmF0ZWd5PXNpbmdsZSBpbiBjb25maWcpJyAnCisJZ2l0IHJl c2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMg Ii0tc3RyYXRlZ3kgc2luZ2xlIiAmJgorCWdpdCBtZXJnZSBjMCAmJgorCXZlcmlmeV9tZXJnZSBm aWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X2hlYWQgJGMxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsg LS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzIgKC0tc3RyYXRl Z3k9c2luZ2xlIGluIGNvbmZpZyknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJdGVzdF90 aWNrICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiLS1zdHJhdGVn eSBzaW5nbGUiICYmCisJaWYgZ2l0IG1lcmdlIGMyCisJdGhlbgorCQlmYWxzZQorCWVsc2UKKwkJ dmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwkJdmVyaWZ5X2hlYWQgJGMxCisJZmkKKycK KwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2Ug YzAgd2l0aCBjMSAoc3RyYXRlZ3k9c2luZ2xlKScgJworCWdpdCByZXNldCAtLWhhcmQgYzAgJiYK Kwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgYzEgLS1zdHJhdGVneT1zaW5nbGUgJiYKKwl2ZXJp ZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJworCit0ZXN0X2Rl YnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIGMw IChzdHJhdGVneSBzaW5nbGUpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCXRlc3RfdGlj ayAmJgorCWdpdCBtZXJnZSBjMCAtLXN0cmF0ZWd5IHNpbmdsZSAmJgorCXZlcmlmeV9tZXJnZSBm aWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X2hlYWQgJGMxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsg LS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzIgKC1zIHNpbmds ZSknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJdGVzdF90aWNrICYmCisJaWYgZ2l0IG1l cmdlIGMyIC1zIHNpbmdsZQorCXRoZW4KKwkJZmFsc2UKKwllbHNlCisJCXZlcmlmeV9tZXJnZSBm aWxlIHJlc3VsdC4xICYmCisJCXZlcmlmeV9oZWFkICRjMQorCWZpCisnCisKK3Rlc3RfZGVidWcg J2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMwIHdpdGggYzEgYW5k IGMyICgtcyBzaW5nbGUpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMCAmJgorCWlmIGdpdCBtZXJn ZSBjMSBjMiAtcyBzaW5nbGUKKwl0aGVuCisJCWZhbHNlCisJZWxzZQorCQl2ZXJpZnlfbWVyZ2Ug ZmlsZSByZXN1bHQuMCAmJgorCQl2ZXJpZnlfaGVhZCAkYzAKKwlmaQorJworCit0ZXN0X2RlYnVn ICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIGMwICgt cyBzaW5nbGUgYW5kIG5vLWZmKScgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwl0ZXN0X3Rp Y2sgJiYKKwlnaXQgbWVyZ2UgLXMgc2luZ2xlIC0tbm8tZmYgYzAgJiYKKwl2ZXJpZnlfbWVyZ2Ug ZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRr IC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIGMyICgtLXN0cmF0 ZWd5PXNpbmdsZSBhbmQgbm8tZmYpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCWdpdCBj b25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIi0tbm8tZmYiICYmCisJdGVzdF90aWNr ICYmCisJaWYgZ2l0IG1lcmdlIGMyIC0tc3RyYXRlZ3k9c2luZ2xlCisJdGhlbgorCQlmYWxzZQor CWVsc2UKKwkJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwkJdmVyaWZ5X2hlYWQgJGMx CisJZmkKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBlY3Rfc3VjY2Vz cyAnbWVyZ2UgYzAgd2l0aCBjMSAobm8tZmYgYW5kIC1zIHNpbmdsZSknICcKKwlnaXQgcmVzZXQg LS1oYXJkIGMwICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiLXMg c2luZ2xlIiAmJgorCXRlc3RfdGljayAmJgorCWlmIGdpdCBtZXJnZSAtLW5vLWZmIGMxCisJdGhl bgorCQlmYWxzZQorCWVsc2UKKwkJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjAgJiYKKwkJdmVy aWZ5X2hlYWQgJGMwCisJZmkKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9l eHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCBjMiAoZmYgYW5kIC1zIHNpbmdsZSknICcKKwln aXQgcmVzZXQgLS1oYXJkIGMxICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0 aW9ucyAiLXMgc2luZ2xlIiAmJgorCXRlc3RfdGljayAmJgorCWlmIGdpdCBtZXJnZSAtLWZmIGMy CisJdGhlbgorCQlmYWxzZQorCWVsc2UKKwkJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYK KwkJdmVyaWZ5X2hlYWQgJGMxCisJZmkKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwor dGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzAgd2l0aCBjMSBhbmQgYzInICcKKwlnaXQgcmVz ZXQgLS1oYXJkIGMwICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAi IiAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSBjMSBjMiAmJgorCXZlcmlmeV9tZXJnZSBm aWxlIHJlc3VsdC4xLTUgJiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEgJGMyCisnCisKK3Rlc3RfZGVi dWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzAs IGMyLCBjMCwgYW5kIGMxJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcg YnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVy Z2UgYzAgYzIgYzAgYzEgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMS01ICYmCisJdmVy aWZ5X3BhcmVudHMgJGMxICRjMgorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCiB0ZXN0 X2RvbmUKLS0gCjEuNS4zLjMKCg== ------=_Part_14567_746071.1200990805261--