21185 2008-09-27 17:10:46 -0700 resolve-ChangeLogs should be able to fix poorly merged ChangeLog entries after a git svn rebase 2008-09-28 18:36:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer aroben eric oldest_to_newest 93099 0 ddkilzer 2008-09-27 17:10:46 -0700 * SUMMARY When working in a local git repository and pushing commits to the WebKit svn directory, there are times when a "git svn rebase" will cause the ChangeLog entry for a locally committed patch to be merged incorrectly (e.g., not at the top of the ChangeLog file). * STEPS TO REPRODUCE 1. You push a patch from git to svn (using git svn dcommit). 2. You commit another patch locally to git, such that a new ChangeLog entry has the same "date header" as the previous one (which is already committed to svn). 3. Someone else commits a ChangeLog entry above the entry from Step 1. 4. You're ready to commit your second patch, so you run "git svn rebase" to pull in svn commits and rebase your patch. * RESULTS After running "git svn rebase", git merges the ChangeLog entry for your second patch somewhere in the "middle" of the ChangeLog file, not at the top as you expected. * WORKAROUND Currently, your only option is to manually edit the ChangeLog file to correct it. 93102 1 23883 ddkilzer 2008-09-27 17:24:09 -0700 Created attachment 23883 Patch v1 Suggested patch. 93176 2 23883 aroben 2008-09-28 16:17:35 -0700 Comment on attachment 23883 Patch v1 The code/comments look good. Can you show an example usage of this new mode (what commands should the user type)? r=me. Thanks for fixing this!! 93182 3 ddkilzer 2008-09-28 16:40:07 -0700 (In reply to comment #2) > (From update of attachment 23883 [edit]) > The code/comments look good. Can you show an example usage of this new mode > (what commands should the user type)? Well, if it doesn't do what you expected, please re-open this bug! Basically, the -f|--fix-merge flag only works on the "last" git commit in the tree, so it assumes that you're going to do a "git commit --amend" after you run the command. (If you have a commit buried in a rebase, your best bet is to use "git rebase -i commit-hash^" and then run this command when you've paused on the errant merge.) * INITIAL STATE The HEAD commit in your git branch contains a mis-merged ChangeLog entry (or two). * STEPS 1. Run: resolve-ChangeLogs -f < ChangeLog1> [< ChangeLog2> ...] Example: ./WebKitTools/Scripts/resolve-ChangeLogs -f WebCore/Changelog WebKit/ChangeLog Note that the fixed ChangeLog files are automatically run through git-add. 2. Amend the commit: git commit --amend Note that you may want to fix up the commit message if it was also trashed. (Is there an easy way to tell git to regenerate the commit message so the commit-log-editor does it's magic again?) 3. You're done. I did notice that it doesn't print out a success message when it merges the file. I will change that before landing. 93183 4 ddkilzer 2008-09-28 16:41:27 -0700 (In reply to comment #3) > I did notice that it doesn't print out a success message when it merges the > file. I will change that before landing. I also thought that there may be a better switch than "-f" (like -r|--remerge), but I was waiting for feedback that someone didn't like -f. :) 93185 5 ddkilzer 2008-09-28 16:58:27 -0700 Committed r37047 I added code to output the status of the ChangeLog file after it was successfully updated, and added a couple missing lines of code. (I did a poor job merging the patch from another tree before I posted it here previously). 93187 6 aroben 2008-09-28 18:19:56 -0700 (In reply to comment #3) > Note that you may want to fix up the commit message if it was also trashed. When/how would the commit message get trashed? > (Is there an easy way to tell git to regenerate the commit message so the > commit-log-editor does it's magic again?) commit-log-editor only generates a ChangeLog template if the input file contains no existing commit message. So you'd have to make sure that the input file is empty or contains only comments. This might involve messing with .git/MERGE_MSG and other files. I don't know all the details. 93188 7 ddkilzer 2008-09-28 18:36:30 -0700 (In reply to comment #6) > (In reply to comment #3) > > Note that you may want to fix up the commit message if it was also trashed. > > When/how would the commit message get trashed? Nevermind. I wasn't thinking when I wrote this. > > (Is there an easy way to tell git to regenerate the commit message so the > > commit-log-editor does it's magic again?) > > commit-log-editor only generates a ChangeLog template if the input file > contains no existing commit message. So you'd have to make sure that the input > file is empty or contains only comments. This might involve messing with > .git/MERGE_MSG and other files. I don't know all the details. I may have to research this some time. Hmm...looks like "man githooks" has some interesting information. I wonder if I can write a prepare-commit-msg hook that conditionally regenerates the changelog entry (when I want it regenerated :)? 23883 2008-09-27 17:24:09 -0700 2008-09-28 16:17:35 -0700 Patch v1 resolve-ChangeLogs-fix-merge.diff text/plain 7196 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1OTE1MmU0Li43N2U3ODkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDgtMDkt MjcgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMjEx ODU6IHJlc29sdmUtQ2hhbmdlTG9ncyBzaG91bGQgYmUgYWJsZSB0byBmaXggcG9vcmx5IG1lcmdl ZCBDaGFuZ2VMb2cgZW50cmllcyBhZnRlciBhIGdpdCBzdm4gcmViYXNlCisKKyAgICAgICAgPGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE4NT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcmVzb2x2ZS1D aGFuZ2VMb2dzOiBBZGRlZCBuZXcgLWZ8LS1maXgtbWVyZ2Ugc3dpdGNoIHRoYXQKKyAgICAgICAg d2lsbCBhdHRlbXB0IHRvIHJlYXBwbHkgdGhlIGxhc3QgY29tbWl0IHRvIGEgQ2hhbmdlTG9nIGZp bGUgc3VjaAorICAgICAgICB0aGF0IHRoZSBDaGFuZ2VMb2cgZW50cnkgYXBwZWFycyBhdCB0aGUg dG9wIG9mIHRoZSBmaWxlLgorICAgICAgICAoZmluZENoYW5nZUxvZyk6IEFkZGVkIHByb3RvdHlw ZSBhbmQgbW92ZWQgbWV0aG9kIGJlbG93IHRoZSBleGl0CisgICAgICAgIHN0YXRlbWVudC4KKyAg ICAgICAgKGZpeE1lcmdlZENoYW5nZUxvZyk6IEFkZGVkLiAgTWV0aG9kIHRvIGZpeCBpbmNvcnJl Y3RseSBtZXJnZWQKKyAgICAgICAgQ2hhbmdlTG9nIGVudHJpZXMuCisKIDIwMDgtMDktMjQgIFNh bSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBB ZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dz IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKaW5kZXggZmEwMTI0My4u M2ZmODliOCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxv Z3MKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKQEAgLTEsNiAr MSw2IEBACiAjIS91c3IvYmluL3BlcmwgLXcKIAotIyBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUg SW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4IEFw cGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKQEAgLTM5LDcgKzM5LDkgQEAgdXNlIEdldG9wdDo6TG9uZzsKIHVzZSBWQ1NVdGlsczsKIAog c3ViIGNvbmZsaWN0RmlsZXMoJCk7CitzdWIgZmluZENoYW5nZUxvZygkKTsKIHN1YiBmaXhDaGFu Z2VMb2dQYXRjaCgkKTsKK3N1YiBmaXhNZXJnZWRDaGFuZ2VMb2coJCk7CiBzdWIgbWVyZ2VDaGFu Z2VzKCQkJCk7CiBzdWIgcmVzb2x2ZUNvbmZsaWN0KCQpOwogc3ViIHNob3dTdGF0dXMoJDskKTsK QEAgLTU1LDE1ICs1Nyw2IEBAIG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAg ICAnd3x3YXJuaW5ncyEnICAgID0+IFwkcHJpbnRXYXJuaW5ncywKICk7CiAKLXN1YiBmaW5kQ2hh bmdlTG9nIHsKLSAgICByZXR1cm4gJF8gaWYgYmFzZW5hbWUoJF8pIGVxICJDaGFuZ2VMb2ciOwot Ci0gICAgbXkgJGZpbGUgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRfLCAiQ2hhbmdlTG9nIik7Ci0g ICAgcmV0dXJuICRmaWxlIGlmIC1kICRfIGFuZCAtZSAkZmlsZTsKLQotICAgIHJldHVybiB1bmRl ZjsKLX0KLQogbXkgQGNoYW5nZUxvZ0ZpbGVzID0gZ3JlcCB7IGRlZmluZWQgJF8gfSBtYXAgeyBm aW5kQ2hhbmdlTG9nKCRfKSB9IEBBUkdWOwogCiBpZiAoc2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykg IT0gc2NhbGFyKEBBUkdWKSkgewpAQCAtNzIsMTEgKzY1LDE1IEBAIGlmIChzY2FsYXIoQGNoYW5n ZUxvZ0ZpbGVzKSAhPSBzY2FsYXIoQEFSR1YpKSB7CiB9IGVsc2lmIChzY2FsYXIoQGNoYW5nZUxv Z0ZpbGVzKSA9PSAwKSB7CiAgICAgcHJpbnQgU1RERVJSICJFUlJPUjogTm8gQ2hhbmdlTG9nIGZp bGVzIGxpc3RlZCBvbiBjb21tYW5kLWxpbmUuXG4iOwogICAgIHVuZGVmICRnZXRPcHRpb25zUmVz dWx0OworfSBlbHNpZiAoJGZpeE1lcmdlZCAmJiAhaXNHaXQoKSkgeworICAgIHByaW50IFNUREVS UiAiRVJST1I6IC0tZml4LW1lcmdlIG1heSBvbmx5IGJlIHVzZWQgd2l0aCBhIGdpdCByZXBvc2l0 b3J5XG4iOworICAgIHVuZGVmICRnZXRPcHRpb25zUmVzdWx0OwogfQogCiBpZiAoISRnZXRPcHRp b25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiA8PF9fRU5EX187CiBV c2FnZTogQHtbIGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10gcGF0aC90by9DaGFuZ2VMb2cgW3Bh dGgvdG8vYW5vdGhlci9DaGFuZ2VMb2cgLi4uXQorICAtZnwtLWZpeC1tZXJnZSAgICAgIGZpeCBh IGdpdC1tZXJnZWQgQ2hhbmdlTG9nIGVudHJ5IHRvIGFwcGVhciBhdCB0aGUgdG9wCiAgIC1ofC0t aGVscCAgICAgICAgICAgc2hvdyB0aGlzIGhlbHAgbWVzc2FnZQogICAtd3wtLVtuby1dd2Fybmlu Z3MgIHNob3cgb3Igc3VwcHJlc3Mgd2FybmluZ3MgKGRlZmF1bHQ6IHNob3cgd2FybmluZ3MpCiBf X0VORF9fCkBAIC04NCwyMiArODEsMjYgQEAgX19FTkRfXwogfQogCiBmb3IgbXkgJGZpbGUgKEBj aGFuZ2VMb2dGaWxlcykgewotICAgIG15ICgkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3 ZXIpID0gY29uZmxpY3RGaWxlcygkZmlsZSk7Ci0gICAgaWYgKCEkZmlsZU1pbmUgfHwgISRmaWxl T2xkZXIgfHwgISRmaWxlTmV3ZXIpIHsKLSAgICAgICAgbmV4dDsKLSAgICB9Ci0gICAgaWYgKG1l cmdlQ2hhbmdlcygkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpKSB7Ci0gICAgICAg IGlmICgkZmlsZSBuZSAkZmlsZU5ld2VyKSB7Ci0gICAgICAgICAgICB1bmxpbmsoJGZpbGUpOwot ICAgICAgICAgICAgcmVuYW1lKCRmaWxlTmV3ZXIsICRmaWxlKSB8fCBkaWU7Ci0gICAgICAgIH0K LSAgICAgICAgdW5saW5rKCRmaWxlTWluZSwgJGZpbGVPbGRlcik7Ci0gICAgICAgIHJlc29sdmVD b25mbGljdCgkZmlsZSk7Ci0gICAgICAgIHNob3dTdGF0dXMoJGZpbGUsIDEpOworICAgIGlmICgk Zml4TWVyZ2VkKSB7CisgICAgICAgIGZpeE1lcmdlZENoYW5nZUxvZygkZmlsZSk7CiAgICAgfSBl bHNlIHsKLSAgICAgICAgc2hvd1N0YXR1cygkZmlsZSk7Ci0gICAgICAgIHByaW50IFNUREVSUiAi V0FSTklORzogJHtmaWxlfSBjb3VsZCBub3QgYmUgbWVyZ2VkIHVzaW5nIGZ1enogbGV2ZWwgMy5c biIgaWYgJHByaW50V2FybmluZ3M7Ci0gICAgICAgIHVubGluaygkZmlsZU1pbmUsICRmaWxlT2xk ZXIsICRmaWxlTmV3ZXIpIGlmIGlzR2l0KCk7CisgICAgICAgIG15ICgkZmlsZU1pbmUsICRmaWxl T2xkZXIsICRmaWxlTmV3ZXIpID0gY29uZmxpY3RGaWxlcygkZmlsZSk7CisgICAgICAgIGlmICgh JGZpbGVNaW5lIHx8ICEkZmlsZU9sZGVyIHx8ICEkZmlsZU5ld2VyKSB7CisgICAgICAgICAgICBu ZXh0OworICAgICAgICB9CisgICAgICAgIGlmIChtZXJnZUNoYW5nZXMoJGZpbGVNaW5lLCAkZmls ZU9sZGVyLCAkZmlsZU5ld2VyKSkgeworICAgICAgICAgICAgaWYgKCRmaWxlIG5lICRmaWxlTmV3 ZXIpIHsKKyAgICAgICAgICAgICAgICB1bmxpbmsoJGZpbGUpOworICAgICAgICAgICAgICAgIHJl bmFtZSgkZmlsZU5ld2VyLCAkZmlsZSkgfHwgZGllOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgdW5saW5rKCRmaWxlTWluZSwgJGZpbGVPbGRlcik7CisgICAgICAgICAgICByZXNvbHZlQ29u ZmxpY3QoJGZpbGUpOworICAgICAgICAgICAgc2hvd1N0YXR1cygkZmlsZSwgMSk7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICBzaG93U3RhdHVzKCRmaWxlKTsKKyAgICAgICAgICAgIHBy aW50IFNUREVSUiAiV0FSTklORzogJHtmaWxlfSBjb3VsZCBub3QgYmUgbWVyZ2VkIHVzaW5nIGZ1 enogbGV2ZWwgMy5cbiIgaWYgJHByaW50V2FybmluZ3M7CisgICAgICAgICAgICB1bmxpbmsoJGZp bGVNaW5lLCAkZmlsZU9sZGVyLCAkZmlsZU5ld2VyKSBpZiBpc0dpdCgpOworICAgICAgICB9CiAg ICAgfQogfQogCkBAIC0xNzYsNiArMTc3LDE1IEBAIHN1YiBjb25mbGljdEZpbGVzKCQpCiAgICAg cmV0dXJuICgkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpOwogfQogCitzdWIgZmlu ZENoYW5nZUxvZygkKSB7CisgICAgcmV0dXJuICRfIGlmIGJhc2VuYW1lKCRfKSBlcSAiQ2hhbmdl TG9nIjsKKworICAgIG15ICRmaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkXywgIkNoYW5nZUxv ZyIpOworICAgIHJldHVybiAkZmlsZSBpZiAtZCAkXyBhbmQgLWUgJGZpbGU7CisKKyAgICByZXR1 cm4gdW5kZWY7Cit9CisKIHN1YiBmaXhDaGFuZ2VMb2dQYXRjaCgkKQogewogICAgIG15ICRwYXRj aCA9IHNoaWZ0OwpAQCAtMjI3LDYgKzIzNyw2OSBAQCBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkK ICAgICByZXR1cm4gJG5ld1BhdGNoOwogfQogCitzdWIgZml4TWVyZ2VkQ2hhbmdlTG9nKCQpCit7 CisgICAgbXkgJGZpbGUgPSBzaGlmdDsKKyAgICBteSAkcGF0Y2g7CisKKyAgICAjIFJlYWQgaW4g cGF0Y2ggZm9yIGluY29ycmVjdGx5IG1lcmdlZCBDaGFuZ2VMb2cgZW50cnkKKyAgICB7CisgICAg ICAgIGxvY2FsICQvID0gdW5kZWY7CisgICAgICAgIG9wZW4gR0lULCAiLXwiLCAkR0lULCAiZGlm ZiIsICJIRUFEXiIsICRmaWxlIHx8IGRpZTsKKyAgICAgICAgJHBhdGNoID0gPEdJVD47CisgICAg ICAgIGNsb3NlIEdJVCB8fCBkaWU7CisgICAgfQorCisgICAgIyBUaGUgcGF0Y2ggbXVzdCBoYXZl IDEgb3IgbW9yZSBsaW5lcyBvZiBjb250ZXh0LCB0aGVuIDEgb3IgbW9yZSBsaW5lcworICAgICMg b2YgYWRkaXRpb25zLCBhbmQgdGhlbiAxIG9yIG1vcmUgbGluZXMgb2YgY29udGV4dC4gIElmIG5v dCwgd2Ugc2tpcCBpdC4KKyAgICBpZiAoJHBhdGNoID1+IC9cbkBAIC0oXGQrKSwoXGQrKSBcKyhc ZCspLChcZCspIEBAXG4oIC4qXG4pKygoXCsuKlxuKSspKCAuKlxuKSskL20pIHsKKyAgICAgICAg IyBDb3B5IHRoZSBoZWFkZXIgZnJvbSB0aGUgb3JpZ2luYWwgcGF0Y2guCisgICAgICAgIG15ICRu ZXdQYXRjaCA9IHN1YnN0cigkcGF0Y2gsIDAsIGluZGV4KCRwYXRjaCwgIkBAIC0kezF9LCR7Mn0g KyR7M30sJHs0fSBAQCIpKTsKKworICAgICAgICAjIEdlbmVyYXRlIGEgbmV3IHNldCBvZiBsaW5l IG51bWJlcnMgYW5kIHBhdGNoIGxlbmd0aHMuICBPdXIgbmV3CisgICAgICAgICMgcGF0Y2ggd2ls bCBzdGFydCB3aXRoIHRoZSBsaW5lcyBmb3IgdGhlIGZpeGVkIENoYW5nZUxvZyBlbnRyeSwKKyAg ICAgICAgIyB0aGVuIGhhdmUgMyBsaW5lcyBvZiBjb250ZXh0IGZyb20gdGhlIHRvcCBvZiB0aGUg Y3VycmVudCBmaWxlIHRvCisgICAgICAgICMgbWFrZSB0aGUgcGF0Y2ggYXBwbHkgY2xlYW5seS4K KyAgICAgICAgJG5ld1BhdGNoIC49ICJAQCAtMSwzICsxLCIgLiAoJDQgLSAkMiArIDMpIC4gIiBA QFxuIjsKKworICAgICAgICAjIFdlIGFzc3VtZSB0aGF0IHRvcCBmZXcgbGluZXMgb2YgdGhlIENo YW5nZUxvZyBlbnRyeSBhcmUgYWN0dWFsbHkKKyAgICAgICAgIyBhdCB0aGUgYm90dG9tIG9mIHRo ZSBsaXN0IG9mIGFkZGVkIGxpbmVzIChkdWUgdG8gdGhlIHdheSB0aGUgcGF0Y2gKKyAgICAgICAg IyBhbGdvcml0aG0gd29ya3MpLCBzbyB3ZSBzaW1wbHkgc2VhcmNoIHRocm91Z2ggdGhlIGxpbmVz IHVudGlsIHdlCisgICAgICAgICMgZmluZCB0aGUgZGF0ZSBsaW5lLCB0aGVuIG1vdmUgdGhlIHJl c3Qgb2YgdGhlIGxpbmVzIHRvIHRoZSB0b3AuCisgICAgICAgIG15IEBwYXRjaExpbmVzID0gbWFw IHsgJF8gLiAiXG4iIH0gc3BsaXQoL1xuLywgJDYpOworICAgICAgICBmb3JlYWNoIG15ICRpICgw IC4uICQjcGF0Y2hMaW5lcykgeworICAgICAgICAgICAgaWYgKCRwYXRjaExpbmVzWyRpXSA9fiAv XlwrXGR7NH0tXGR7Mn0tXGR7Mn0gIC8pIHsKKyAgICAgICAgICAgICAgICB1bnNoaWZ0KEBwYXRj aExpbmVzLCBzcGxpY2UoQHBhdGNoTGluZXMsICRpLCBzY2FsYXIoQHBhdGNoTGluZXMpIC0gJGkp KTsKKyAgICAgICAgICAgICAgICBsYXN0OworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAg ICAgICAgJG5ld1BhdGNoIC49IGpvaW4oIiIsIEBwYXRjaExpbmVzKTsKKworICAgICAgICAjIEFk ZCAzIGxpbmVzIG9mIGNvbnRleHQgdG8gdGhlIGVuZAorICAgICAgICBvcGVuIEZJTEUsICI8Iiwg JGZpbGUgfHwgZGllOworICAgICAgICBmb3IgKG15ICRpID0gMDsgJGkgPCAzOyAkaSsrKSB7Cisg ICAgICAgICAgICAkbmV3UGF0Y2ggLj0gIiAiIC4gPEZJTEU+OworICAgICAgICB9CisgICAgICAg IGNsb3NlIEZJTEU7CisKKyAgICAgICAgIyBVbmFwcGx5IHRoZSBvbGQgcGF0Y2gKKyAgICAgICAg b3BlbihQQVRDSCwgInwgcGF0Y2ggLXAxIC0tcmV2ZXJzZSAkZmlsZSA+IC9kZXYvbnVsbCIpIHx8 IGRpZTsKKyAgICAgICAgcHJpbnQgUEFUQ0ggJHBhdGNoOworICAgICAgICBjbG9zZShQQVRDSCkg fHwgZGllOworCisgICAgICAgICMgQXBwbHkgdGhlIG5ldyBwYXRjaAorICAgICAgICBvcGVuKFBB VENILCAifCBwYXRjaCAtcDEgJGZpbGUgPiAvZGV2L251bGwiKSB8fCBkaWU7CisgICAgICAgIHBy aW50IFBBVENIICRuZXdQYXRjaDsKKyAgICAgICAgY2xvc2UoUEFUQ0gpIHx8IGRpZTsKKworICAg ICAgICAjIFJ1biAiZ2l0IGFkZCIgb24gdGhlIGZpeGVkIENoYW5nZUxvZyBmaWxlCisgICAgICAg IHN5c3RlbSgkR0lULCAiYWRkIiwgJGZpbGUpOworICAgIH0gZWxzZSB7CisgICAgICAgIHByaW50 IFNUREVSUiAiV0FSTklORzogTGFzdCBjaGFuZ2UgdG8gJHtmaWxlfSBjb3VsZCBub3QgYmUgZml4 ZWQgYW5kIHJlLW1lcmdlZC5cbiIgaWYgJHByaW50V2FybmluZ3M7CisgICAgfQorfQorCiBzdWIg bWVyZ2VDaGFuZ2VzKCQkJCkKIHsKICAgICBteSAoJGZpbGVNaW5lLCAkZmlsZU9sZGVyLCAkZmls ZU5ld2VyKSA9IEBfOwo=