138375 2014-11-04 14:21:31 -0800 Add a method for performing cherrypick-merges to git.py 2015-02-26 06:07:09 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 matthew_hanson webkit-unassigned commit-queue dbates ddkilzer glenn matthew_hanson ossy rniwa oldest_to_newest 1046178 0 matthew_hanson 2014-11-04 14:21:31 -0800 Cherrypick-merge support is hugely important to the effort to improve merge workflows. 1046185 1 240949 matthew_hanson 2014-11-04 14:47:22 -0800 Created attachment 240949 Patch to add cherrypick-merge support to git.py 1046375 2 dbates 2014-11-04 20:56:30 -0800 Committed in <http://trac.webkit.org/changeset/175606>. 240949 2014-11-04 14:47:22 -0800 2014-11-04 17:19:33 -0800 Patch to add cherrypick-merge support to git.py 0004-Add-a-method-for-performing-cherrypick-merges.patch text/plain 1989 matthew_hanson RnJvbSA5Mjk4NDRlOWY2N2ZiZWVkOGY4MDI0OGNhMjdhZTNmODRhMzc4MTU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEhhbnNvbiA8bWF0dGhld19oYW5zb25AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDQgTm92IDIwMTQgMTQ6MjI6NDIgLTA4MDAKU3ViamVjdDogW1BBVENI IDQvNF0gQWRkIGEgbWV0aG9kIGZvciBwZXJmb3JtaW5nIGNoZXJyeXBpY2stbWVyZ2VzLgogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODM3NQoKQWRkcyBzdXBwb3J0 IGZvciBjaGVycnlwaWNrLW1lcmdlcy4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgooR2l0LmNoZXJyeXBp Y2tfbWVyZ2UpOiBBZGRlZC4KLS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgMTIgKysrKysrKysrKysrCiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IHwgIDQgKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDYxZGZmYjUuLjdiODFmNzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxNC0xMS0wNCAgTWF0 dGhldyBIYW5zb24gIDxtYXR0aGV3X2hhbnNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEg bWV0aG9kIGZvciBwZXJmb3JtaW5nIGNoZXJyeXBpY2stbWVyZ2VzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4Mzc1CisKKyAgICAgICAgQWRkcyBz dXBwb3J0IGZvciBjaGVycnlwaWNrLW1lcmdlcy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9naXQucHk6CisgICAgICAgIChHaXQuY2hlcnJ5cGlja19tZXJnZSk6IEFkZGVkLgorCisy MDE0LTExLTA0ICBNYXR0aGV3IEhhbnNvbiAgPG1hdHRoZXdfaGFuc29uQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGQgYSB3YXkgdG8gYXNjZXJ0YWluIHRoZSBTVk4gVVJMIGFzc29jaWF0ZWQgd2l0 aCBhIEdpdCBicmFuY2guCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzgzNzQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9naXQucHkKaW5kZXggOTk5NjAyNy4uYTk0ODBjMyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC00OTYsNiAr NDk2LDEwIEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICBmaXJzdF9y ZW1vdGVfYnJhbmNoX3JlZiA9IHJlbW90ZV9icmFuY2hfcmVmcy5zcGxpdCgnXG4nKVswXQogICAg ICAgICByZXR1cm4gZmlyc3RfcmVtb3RlX2JyYW5jaF9yZWYuc3BsaXQoJzonKVsxXQogCisgICAg ZGVmIGNoZXJyeXBpY2tfbWVyZ2Uoc2VsZiwgY29tbWl0KToKKyAgICAgICAgZ2l0X2FyZ3MgPSBb J2NoZXJyeS1waWNrJywgJy1uJywgY29tbWl0XQorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dp dChnaXRfYXJncykKKwogICAgIGRlZiBjb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2Uoc2VsZiwg bWVzc2FnZSk6CiAgICAgICAgIHNlbGYuX3J1bl9naXQoWydjb21taXQnLCAnLS1hbGwnLCAnLUYn LCAnLSddLCBpbnB1dD1tZXNzYWdlKQogCi0tIAoyLjEuMSAoQXBwbGUgR2l0LTUxKQoK