34206 2010-01-27 01:08:44 -0800 Improve update-webkit's Git code-path to support mirrors and resolve-ChangeLogs 2022-09-10 16:22:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED WONTFIX P2 Normal --- 28721 1 vestbo webkit-unassigned abarth ahmad.saleem792 ap aroben cjerdonek ddkilzer eric evan gsnedders ryanhaddad oldest_to_newest 184994 0 vestbo 2010-01-27 01:08:44 -0800 Improve update-webkit's Git code-path to support mirrors and resolve-ChangeLogs 185002 1 47510 vestbo 2010-01-27 01:46:18 -0800 Created attachment 47510 Patch 185005 2 47511 vestbo 2010-01-27 01:53:14 -0800 Created attachment 47511 updated to exit(1) if we couldnt resolve all conflicts 187251 3 abarth 2010-02-02 20:42:12 -0800 Looks plausible to me, but I don't read Perl very well. Certainly much more awesome than my version. :) 187263 4 evan 2010-02-02 21:40:59 -0800 + # Check the git config for a possible mirror remote we can use + my $remotes = `git config --get-regexp "^remote\..+\.url"`; + if ($remotes =~ /^remote\.(.*?)\.url .*?\/webkit\.git$/mi) { If I'm reading this right, you're considering any url ending with webkit.git as a webkit mirror? I can see what you're trying to do, but seems a bit weak. You might consider doing what we do in Chrome: make both "git fetch" as well as "git svn rebase" update the same branch. When you use the git fetch to advance the remote branch, the next time you run a git svn command git recognizes that you've fetched the commits via another mechanism and just fast-forwards its index. It's just a minor tweak to how you set up git-svn: http://code.google.com/p/chromium/wiki/UsingGit#Initial_Setup 190935 5 vestbo 2010-02-17 01:59:52 -0800 (In reply to comment #4) > + # Check the git config for a possible mirror remote we can use > + my $remotes = `git config --get-regexp "^remote\..+\.url"`; > + if ($remotes =~ /^remote\.(.*?)\.url .*?\/webkit\.git$/mi) { > > If I'm reading this right, you're considering any url ending with webkit.git as > a webkit mirror? I can see what you're trying to do, but seems a bit weak. True, you could have more remotes (personal repos for example) that also end with webkit.git. If did it this way instead of hardcoding git.webkit.org/webkit.git so that it would also work for mirrors like gitorius.org/webkit/webkit.git, but I guess we should be a bit more explicit. > You might consider doing what we do in Chrome: make both "git fetch" as well as > "git svn rebase" update the same branch. When you use the git fetch to advance > the remote branch, the next time you run a git svn command git recognizes that > you've fetched the commits via another mechanism and just fast-forwards its > index. It's just a minor tweak to how you set up git-svn: > http://code.google.com/p/chromium/wiki/UsingGit#Initial_Setup That's a nice trick, but it assumes that the git mirror has a branch named trunk. Neither git.webkit.org/webkit.git or gitorious.org/webkit/webkit.git are set up like this, they have a master-branch. It also assumes the user remembers to svn init with that prefix and not use the full trunk URL. I also remember seeing some problems when doing this myself, possibly due to bugs in git. git-svn would get very confused if if though it had fetched something and then the mirror was lagging so it reset the branch to a svn revision before what git-svn thought it had fetched, etc. That's why the script uses git-cherry to make sure the master is ahead of the git-svn branch before updating it. Anyways, I'll upload a new patch that does not have the resolve-ChangeLog-logic, which is no longer needed once the merge-driver patch lands. 1897619 6 ahmad.saleem792 2022-09-10 15:17:41 -0700 Is it needed anymore? Thanks! 1897643 7 ap 2022-09-10 16:22:20 -0700 It's not. 47510 2010-01-27 01:46:18 -0800 2010-01-27 01:53:07 -0800 Patch bug-34206-20100127104616.patch text/plain 7099 vestbo ZGlmZiAtLWdpdCBjL1dlYktpdFRvb2xzL0NoYW5nZUxvZyB3L1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkMTVlY2EyLi5mMjg4MTU1IDEwMDY0NAotLS0gYy9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIHcvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEt MjcgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJvdmUgdXBkYXRl LXdlYmtpdCdzIEdpdCBjb2RlLXBhdGggdG8gc3VwcG9ydCBtaXJyb3JzIGFuZCByZXNvbHZlLUNo YW5nZUxvZ3MKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzQyMDYKKworICAgICAgICBJZiBhIEdpdCBtaXJyb3IgaXMgZm91bmQgaW4gdGhlIC5naXQv Y29uZmlnIGl0J3MgdXNlZCB0byB1cGRhdGUgdGhlIGxvY2FsCisgICAgICAgIGdpdC1zdm4gYnJh bmNoLCBhbmQgZ2l0LXN2biBpcyB0aGVuIHVzZWQgdG8gZmV0Y2ggdGhlIGxhdGVzdCBjaGFuZ2Vz LgorCisgICAgICAgIFRoZSBzY3JpcHQgc2hvdWxkIHdvcmsgYm90aCB3aXRob3V0IGEgbWlycm9y LCBmb3IgcGVvcGxlIHdobyBvbmx5IHVzZSBnaXQtc3ZuLAorICAgICAgICBvciB3aXRob3V0IGEg Z2l0LXN2biByZW1vdGUsIGluIGNhc2Ugb2YgcGVvcGxlIGNsb25pbmcgYSBnaXQgbWlycm9yIGJ1 dCBub3QKKyAgICAgICAgdXNpbmcgZ2l0LXN2bi4KKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRl LXdlYmtpdDoKKwogMjAxMC0wMS0yNSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGMvV2Vi S2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0IHcvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0CmluZGV4IDc2MDJjNDEuLmMxODkzMTAgMTAwNzU1Ci0tLSBjL1dlYktpdFRvb2xz L1NjcmlwdHMvdXBkYXRlLXdlYmtpdAorKysgdy9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQKQEAgLTczLDcgKzczLDcgQEAgcHVzaCBAc3ZuT3B0aW9ucywgJy1xJyBpZiAkcXVpZXQ7 CiAjIERvbid0IHByb21wdCB3aGVuIHVzaW5nIHN2bi0xLjYgb3IgbmV3ZXIuCiBwdXNoIEBzdm5P cHRpb25zLCBxdygtLWFjY2VwdCBwb3N0cG9uZSkgaWYgaXNTVk5WZXJzaW9uMTZPck5ld2VyKCk7 CiAKLXByaW50ICJVcGRhdGluZyBPcGVuU291cmNlXG4iIHVubGVzcyAkcXVpZXQ7CitwcmludCAi VXBkYXRpbmcgZnJvbSBXZWJLaXQgdHJ1bmsuLi5cbiIgdW5sZXNzICRxdWlldDsKIHJ1blN2blVw ZGF0ZSgpIGlmICRpc1NWTjsKIHJ1bkdpdFVwZGF0ZSgpIGlmICRpc0dpdDsKIApAQCAtOTIsMjkg KzkyLDE0MyBAQCBzZXR1cEFwcGxlV2luRW52KCkgaWYgaXNBcHBsZVdpbldlYktpdCgpOwogCiBl eGl0IDA7CiAKK3N1YiByZXNvbHZlQ2hhbmdlTG9ncworeworICAgIG15IEBjb25mbGljdGVkQ2hh bmdlTG9ncyA9IEBfOworICAgIHByaW50ICJBdHRlbXB0aW5nIHRvIGF1dG9tYXRpY2FsbHkgcmVz b2x2ZSBjb25mbGljdGVkIENoYW5nZUxvZ3MuLi5cbiI7CisgICAgbXkgJHJlc29sdmVDaGFuZ2VM b2dzUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoZGlybmFtZSgkMCksICJyZXNvbHZlLUNoYW5n ZUxvZ3MiKTsKKyAgICAoc3lzdGVtKCRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsICItLW5vLXdhcm5p bmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSA9PSAwKQorICAgICAgICBvciBkaWUgIkNvdWxk IG5vdCBvcGVuIHJlc29sdmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKK30KKwogc3ViIHJ1 blN2blVwZGF0ZSgpCiB7CiAgICAgb3BlbiBVUERBVEUsICItfCIsICJzdm4iLCAidXBkYXRlIiwg QHN2bk9wdGlvbnMgb3IgZGllOwogICAgIG15IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKKyAgICBt eSBAY29uZmxpY3RlZE90aGVyRmlsZXM7CiAgICAgd2hpbGUgKG15ICRsaW5lID0gPFVQREFURT4p IHsKICAgICAgICAgcHJpbnQgJGxpbmU7Ci0gICAgICAgICRsaW5lID1+IG0vXkNccysoLis/KVtc clxuXSokLzsKLSAgICAgICAgaWYgKCQxKSB7Ci0gICAgICAgICAgbXkgJGZpbGVuYW1lID0gbm9y bWFsaXplUGF0aCgkMSk7Ci0gICAgICAgICAgcHVzaCBAY29uZmxpY3RlZENoYW5nZUxvZ3MsICRm aWxlbmFtZSBpZiBiYXNlbmFtZSgkZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciOworICAgICAgICBp ZiAoJGxpbmUgPX4gbS9eQ1xzKyguKz8pW1xyXG5dKiQvKSB7CisgICAgICAgICAgICBteSAkZmls ZW5hbWUgPSBub3JtYWxpemVQYXRoKCQxKTsKKyAgICAgICAgICAgIGlmIChiYXNlbmFtZSgkZmls ZW5hbWUpIGVxICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAY29uZmxpY3Rl ZENoYW5nZUxvZ3MsICRmaWxlbmFtZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAgICAgcHVzaCBAY29uZmxpY3RlZE90aGVyRmlsZXMsICRmaWxlbmFtZTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0KICAgICBjbG9zZSBVUERBVEUgb3IgZGllOwogCi0gICAgaWYg KEBjb25mbGljdGVkQ2hhbmdlTG9ncykgewotICAgICAgICBwcmludCAiQXR0ZW1wdGluZyB0byBt ZXJnZSBjb25mbGljdGVkIENoYW5nZUxvZ3MuXG4iOwotICAgICAgICBteSAkcmVzb2x2ZUNoYW5n ZUxvZ3NQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShkaXJuYW1lKCQwKSwgInJlc29sdmUtQ2hh bmdlTG9ncyIpOwotICAgICAgICAoc3lzdGVtKCRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsICItLW5v LXdhcm5pbmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSA9PSAwKQotICAgICAgICAgICAgb3Ig ZGllICJDb3VsZCBub3Qgb3BlbiByZXNvbHZlLUNoYW5nZUxvZ3Mgc2NyaXB0OiAkIS5cbiI7Cisg ICAgcmVzb2x2ZUNoYW5nZUxvZ3MoQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSBpZiBAY29uZmxpY3Rl ZENoYW5nZUxvZ3M7CisKKyAgICAjIFRPRE86IERlYWwgd2l0aCBjaGFuZ2Vsb2dzIHRoYXQgY291 bGQgbm90IGJlIHJlc29sdmVkLCBvciBvdGhlciBjb25mbGljdGluZyBmaWxlcworfQorCitzdWIg cnVuR2l0UmViYXNlCit7CisgICAgbXkgKCRyZWYsICRjb250aW51ZSkgPSBAXzsKKworICAgIG15 IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKKyAgICBteSBAY29uZmxpY3RlZE90aGVyRmlsZXM7CisK KyAgICAjIE1ha2Ugc3VyZSB0aGVyZSBhcmUgbm8gdW5zdGFnZWQgZmlsZXMgYmVmb3JlIHRyeWlu ZyBhIHJlYmFzZSAtLWNvbnRpbnVlCisgICAgaWYgKCRjb250aW51ZSkgeworICAgICAgICBteSAk dW5zdGFnZWQgPSBgZ2l0IHVwZGF0ZS1pbmRleCAtLWlnbm9yZS1zdWJtb2R1bGVzIC0tcmVmcmVz aGA7CisgICAgICAgIGlmICgkdW5zdGFnZWQgPX4gbS9eKC4rPyk6IG5lZWRzIG1lcmdlJC8pIHsK KyAgICAgICAgICAgIG15ICRmaWxlbmFtZSA9IG5vcm1hbGl6ZVBhdGgoJDEpOworICAgICAgICAg ICAgaWYgKGJhc2VuYW1lKCRmaWxlbmFtZSkgZXEgIkNoYW5nZUxvZyIpIHsKKyAgICAgICAgICAg ICAgICBwdXNoIEBjb25mbGljdGVkQ2hhbmdlTG9ncywgJGZpbGVuYW1lOworICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICBwdXNoIEBjb25mbGljdGVkT3RoZXJGaWxlcywgJGZp bGVuYW1lOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgaWYgKEBjb25mbGlj dGVkQ2hhbmdlTG9ncyBvciBAY29uZmxpY3RlZE90aGVyRmlsZXMpIHsKKyAgICAgICAgICAgIHJl dHVybiAoXEBjb25mbGljdGVkQ2hhbmdlTG9ncywgXEBjb25mbGljdGVkT3RoZXJGaWxlcyk7Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICBvcGVuIFJFQkFTRSwgIi18IiwgImdpdCIsICJyZWJhc2Ui LCAoJGNvbnRpbnVlID8gIi0tY29udGludWUiIDogJHJlZiApIG9yIGRpZTsKKyAgICB3aGlsZSAo bXkgJGxpbmUgPSA8UkVCQVNFPikgeworICAgICAgICBwcmludCAkbGluZTsKKyAgICAgICAgaWYg KCRsaW5lID1+IG0vOiBNZXJnZSBjb25mbGljdCBpbiAoLis/KSQvKSB7CisgICAgICAgICAgICBt eSAkZmlsZW5hbWUgPSBub3JtYWxpemVQYXRoKCQxKTsKKyAgICAgICAgICAgIGlmIChiYXNlbmFt ZSgkZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAY29u ZmxpY3RlZENoYW5nZUxvZ3MsICRmaWxlbmFtZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgcHVzaCBAY29uZmxpY3RlZE90aGVyRmlsZXMsICRmaWxlbmFtZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KKyAgICBjbG9zZSBSRUJBU0U7CisKKyAgICByZXR1 cm4gKFxAY29uZmxpY3RlZENoYW5nZUxvZ3MsIFxAY29uZmxpY3RlZE90aGVyRmlsZXMpOwogfQog CiBzdWIgcnVuR2l0VXBkYXRlKCkKIHsKLSAgICBzeXN0ZW0oImdpdCIsICJzdm4iLCAicmViYXNl IikgPT0gMCBvciBkaWU7CisgICAgbXkgJHVuc3RhZ2VkID0gYGdpdCB1cGRhdGUtaW5kZXggLS1p Z25vcmUtc3VibW9kdWxlcyAtLXJlZnJlc2hgOworICAgIGRpZSAiWW91IGhhdmUgdW5zdGFnZWQg Y2hhbmdlcywgcGxlYXNlIHN0YXNoIGJlZm9yZSB1cGRhdGluZ1xuIiBpZiAkPzsKKworICAgIG15 ICRzdGFnZWQgPSBgZ2l0IGRpZmYtaW5kZXggLS1jYWNoZWQgLS1uYW1lLXN0YXR1cyAtciAtLWln bm9yZS1zdWJtb2R1bGVzIEhFQUQgLS1gOworICAgIGRpZSgiWW91IGhhdmUgc3RhZ2VkIGNoYW5n ZXMsIHBsZWFzZSBzdGFzaCBiZWZvcmUgdXBkYXRpbmdcbiIpIGlmICRzdGFnZWQ7CisKKyAgICAj IFJlc29sdmUgdGhlIGdpdC1zdm4gcmVmIG5hbWUKKyAgICBteSBAcmVmc3BlYyA9IHNwbGl0KC86 LywgYGdpdCBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2hgKTsKKyAgICBteSAkc3Zu X3JlZiA9IEByZWZzcGVjID4gMSA/ICRyZWZzcGVjWzFdIDogdW5kZWY7CisgICAgY2hvbXAoJHN2 bl9yZWYpIGlmICRzdm5fcmVmOworCisgICAgbXkgJG1pcnJvcl9yZWYgPSB1bmRlZjsKKworICAg ICMgQ2hlY2sgdGhlIGdpdCBjb25maWcgZm9yIGEgcG9zc2libGUgbWlycm9yIHJlbW90ZSB3ZSBj YW4gdXNlCisgICAgbXkgJHJlbW90ZXMgPSBgZ2l0IGNvbmZpZyAtLWdldC1yZWdleHAgIl5yZW1v dGVcLi4rXC51cmwiYDsKKyAgICBpZiAoJHJlbW90ZXMgPX4gL15yZW1vdGVcLiguKj8pXC51cmwg Lio/XC93ZWJraXRcLmdpdCQvbWkpIHsKKyAgICAgICAgbXkgJG1pcnJvciA9ICQxOworICAgICAg ICBAcmVmc3BlYyA9IHNwbGl0KC86LywgYGdpdCBjb25maWcgLS1nZXQgcmVtb3RlLiRtaXJyb3Iu ZmV0Y2hgKTsKKyAgICAgICAgaWYgKEByZWZzcGVjID4gMSkgeworICAgICAgICAgICAgJG1pcnJv cl9yZWYgPSAkcmVmc3BlY1sxXTsKKyAgICAgICAgICAgIGNob21wKCRtaXJyb3JfcmVmKTsKKyAg ICAgICAgICAgICRtaXJyb3JfcmVmID1+IHMvXCokL21hc3Rlci87CisKKyAgICAgICAgICAgICMg RmV0Y2ggbGF0ZXN0IGNoYW5nZXMgZnJvbSB0aGUgbWlycm9yIGZpcnN0LCBzaW5jZSBpdCdzIGZh c3RlcgorICAgICAgICAgICAgc3lzdGVtKCJnaXQiLCAiZmV0Y2giLCAkbWlycm9yKSA9PSAwIG9y IGRpZTsKKworICAgICAgICAgICAgaWYgKCRzdm5fcmVmKSB7CisgICAgICAgICAgICAgICAgIyBG YXN0IGZvcndhcmQgdGhlIGdpdC1zdm4gcmVmIGlmIHRoZSBtaXJyb3IgaXMgbW9yZSByZWNlbnQK KyAgICAgICAgICAgICAgICBteSAkY2hlcnJ5ID0gYGdpdCBjaGVycnkgJHN2bl9yZWYgJG1pcnJv cl9yZWZgOworCisgICAgICAgICAgICAgICAgaWYgKCRjaGVycnkgPX4gL15bK3wtXS8pIHsKKyAg ICAgICAgICAgICAgICAgICAgbXkgJGxhdGVzdF9taXJyb3Jfc2hhID0gYGdpdCByZXYtcGFyc2Ug JG1pcnJvcl9yZWZgOworICAgICAgICAgICAgICAgICAgICBjaG9tcCgkbGF0ZXN0X21pcnJvcl9z aGEpOworICAgICAgICAgICAgICAgICAgICBzeXN0ZW0oImdpdCIsICJ1cGRhdGUtcmVmIiwgJHN2 bl9yZWYsICRsYXRlc3RfbWlycm9yX3NoYSkgPT0gMCBvciBkaWU7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCRzdm5fcmVmKSB7 CisgICAgICAgICMgRmV0Y2ggbGF0ZXN0IGNoYW5nZXMgZnJvbSBTVk4gKHRoZSBtaXJyb3IgbWF5 IGJlIGEgZmV3IG1pbnV0ZXMgb2xkKQorICAgICAgICBzeXN0ZW0oImdpdCIsICJzdm4iLCAiZmV0 Y2giKTsKKyAgICB9CisKKyAgICBteSAkcmViYXNlX3JlZiA9ICRzdm5fcmVmID8gJHN2bl9yZWYg OiAkbWlycm9yX3JlZjsKKyAgICBpZiAoISRyZWJhc2VfcmVmKSB7CisgICAgICAgIGRpZSAiQ291 bGQgbm90IGZpbmQgYSBzdWl0YWJsZSByZW1vdGUgYnJhbmNoIHRvIHJlYmFzZSBhZ2FpbnN0Llxu IjsKKyAgICB9CisKKyAgICAjIERvIHJlYmFzZQorICAgIG15ICgkY29uZmxpY3RlZENoYW5nZUxv Z3MsICRjb25mbGljdGVkT3RoZXJGaWxlcykgPSBydW5HaXRSZWJhc2UoJHJlYmFzZV9yZWYpOwor ICAgIGlmIChAJGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSB7CisgICAgICAgIHJlc29sdmVDaGFuZ2VM b2dzKEAkY29uZmxpY3RlZENoYW5nZUxvZ3MpOworICAgICAgICAoJGNvbmZsaWN0ZWRDaGFuZ2VM b2dzLCAkY29uZmxpY3RlZE90aGVyRmlsZXMpID0gcnVuR2l0UmViYXNlKCRyZWJhc2VfcmVmLCAx KTsKKyAgICB9CisKKyAgICAjIERlYWwgd2l0aCBjaGFuZ2Vsb2dzIHRoYXQgZmFpbGVkIHRvIHJl c29sdmUsIG9yIG90aGVyIGNvbmZsaWN0aW5nIGZpbGVzCisgICAgaWYgKEAkY29uZmxpY3RlZENo YW5nZUxvZ3Mgb3IgQCRjb25mbGljdGVkT3RoZXJGaWxlcykgeworICAgICAgICBwcmludCAiVGhl IGZvbGxvd2luZyBmaWxlcyBuZWVkIHRvIGJlIG1hbnVhbGx5IHJlc29sdmVkOlxuIjsKKyAgICAg ICAgZm9yZWFjaCBteSAkZmlsZSAoQCRjb25mbGljdGVkQ2hhbmdlTG9ncywgQCRjb25mbGljdGVk T3RoZXJGaWxlcykgeworICAgICAgICAgICAgcHJpbnQgIlx0JGZpbGVcbiI7CisgICAgICAgIH0K KyAgICAgICAgcHJpbnQgIlxuIjsKKyAgICB9CiB9Cg== 47511 2010-01-27 01:53:14 -0800 2010-02-17 02:00:19 -0800 updated to exit(1) if we couldnt resolve all conflicts bug-34206-20100127105312.patch text/plain 7112 vestbo ZGlmZiAtLWdpdCBjL1dlYktpdFRvb2xzL0NoYW5nZUxvZyB3L1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkMTVlY2EyLi5mMjg4MTU1IDEwMDY0NAotLS0gYy9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIHcvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEt MjcgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJvdmUgdXBkYXRl LXdlYmtpdCdzIEdpdCBjb2RlLXBhdGggdG8gc3VwcG9ydCBtaXJyb3JzIGFuZCByZXNvbHZlLUNo YW5nZUxvZ3MKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzQyMDYKKworICAgICAgICBJZiBhIEdpdCBtaXJyb3IgaXMgZm91bmQgaW4gdGhlIC5naXQv Y29uZmlnIGl0J3MgdXNlZCB0byB1cGRhdGUgdGhlIGxvY2FsCisgICAgICAgIGdpdC1zdm4gYnJh bmNoLCBhbmQgZ2l0LXN2biBpcyB0aGVuIHVzZWQgdG8gZmV0Y2ggdGhlIGxhdGVzdCBjaGFuZ2Vz LgorCisgICAgICAgIFRoZSBzY3JpcHQgc2hvdWxkIHdvcmsgYm90aCB3aXRob3V0IGEgbWlycm9y LCBmb3IgcGVvcGxlIHdobyBvbmx5IHVzZSBnaXQtc3ZuLAorICAgICAgICBvciB3aXRob3V0IGEg Z2l0LXN2biByZW1vdGUsIGluIGNhc2Ugb2YgcGVvcGxlIGNsb25pbmcgYSBnaXQgbWlycm9yIGJ1 dCBub3QKKyAgICAgICAgdXNpbmcgZ2l0LXN2bi4KKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRl LXdlYmtpdDoKKwogMjAxMC0wMS0yNSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGMvV2Vi S2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0IHcvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0CmluZGV4IDc2MDJjNDEuLmFhOTQzY2MgMTAwNzU1Ci0tLSBjL1dlYktpdFRvb2xz L1NjcmlwdHMvdXBkYXRlLXdlYmtpdAorKysgdy9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQKQEAgLTczLDcgKzczLDcgQEAgcHVzaCBAc3ZuT3B0aW9ucywgJy1xJyBpZiAkcXVpZXQ7 CiAjIERvbid0IHByb21wdCB3aGVuIHVzaW5nIHN2bi0xLjYgb3IgbmV3ZXIuCiBwdXNoIEBzdm5P cHRpb25zLCBxdygtLWFjY2VwdCBwb3N0cG9uZSkgaWYgaXNTVk5WZXJzaW9uMTZPck5ld2VyKCk7 CiAKLXByaW50ICJVcGRhdGluZyBPcGVuU291cmNlXG4iIHVubGVzcyAkcXVpZXQ7CitwcmludCAi VXBkYXRpbmcgZnJvbSBXZWJLaXQgdHJ1bmsuLi5cbiIgdW5sZXNzICRxdWlldDsKIHJ1blN2blVw ZGF0ZSgpIGlmICRpc1NWTjsKIHJ1bkdpdFVwZGF0ZSgpIGlmICRpc0dpdDsKIApAQCAtOTIsMjkg KzkyLDE0NCBAQCBzZXR1cEFwcGxlV2luRW52KCkgaWYgaXNBcHBsZVdpbldlYktpdCgpOwogCiBl eGl0IDA7CiAKK3N1YiByZXNvbHZlQ2hhbmdlTG9ncworeworICAgIG15IEBjb25mbGljdGVkQ2hh bmdlTG9ncyA9IEBfOworICAgIHByaW50ICJBdHRlbXB0aW5nIHRvIGF1dG9tYXRpY2FsbHkgcmVz b2x2ZSBjb25mbGljdGVkIENoYW5nZUxvZ3MuLi5cbiI7CisgICAgbXkgJHJlc29sdmVDaGFuZ2VM b2dzUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoZGlybmFtZSgkMCksICJyZXNvbHZlLUNoYW5n ZUxvZ3MiKTsKKyAgICAoc3lzdGVtKCRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsICItLW5vLXdhcm5p bmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSA9PSAwKQorICAgICAgICBvciBkaWUgIkNvdWxk IG5vdCBvcGVuIHJlc29sdmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKK30KKwogc3ViIHJ1 blN2blVwZGF0ZSgpCiB7CiAgICAgb3BlbiBVUERBVEUsICItfCIsICJzdm4iLCAidXBkYXRlIiwg QHN2bk9wdGlvbnMgb3IgZGllOwogICAgIG15IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKKyAgICBt eSBAY29uZmxpY3RlZE90aGVyRmlsZXM7CiAgICAgd2hpbGUgKG15ICRsaW5lID0gPFVQREFURT4p IHsKICAgICAgICAgcHJpbnQgJGxpbmU7Ci0gICAgICAgICRsaW5lID1+IG0vXkNccysoLis/KVtc clxuXSokLzsKLSAgICAgICAgaWYgKCQxKSB7Ci0gICAgICAgICAgbXkgJGZpbGVuYW1lID0gbm9y bWFsaXplUGF0aCgkMSk7Ci0gICAgICAgICAgcHVzaCBAY29uZmxpY3RlZENoYW5nZUxvZ3MsICRm aWxlbmFtZSBpZiBiYXNlbmFtZSgkZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciOworICAgICAgICBp ZiAoJGxpbmUgPX4gbS9eQ1xzKyguKz8pW1xyXG5dKiQvKSB7CisgICAgICAgICAgICBteSAkZmls ZW5hbWUgPSBub3JtYWxpemVQYXRoKCQxKTsKKyAgICAgICAgICAgIGlmIChiYXNlbmFtZSgkZmls ZW5hbWUpIGVxICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAY29uZmxpY3Rl ZENoYW5nZUxvZ3MsICRmaWxlbmFtZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAgICAgcHVzaCBAY29uZmxpY3RlZE90aGVyRmlsZXMsICRmaWxlbmFtZTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0KICAgICBjbG9zZSBVUERBVEUgb3IgZGllOwogCi0gICAgaWYg KEBjb25mbGljdGVkQ2hhbmdlTG9ncykgewotICAgICAgICBwcmludCAiQXR0ZW1wdGluZyB0byBt ZXJnZSBjb25mbGljdGVkIENoYW5nZUxvZ3MuXG4iOwotICAgICAgICBteSAkcmVzb2x2ZUNoYW5n ZUxvZ3NQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShkaXJuYW1lKCQwKSwgInJlc29sdmUtQ2hh bmdlTG9ncyIpOwotICAgICAgICAoc3lzdGVtKCRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsICItLW5v LXdhcm5pbmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSA9PSAwKQotICAgICAgICAgICAgb3Ig ZGllICJDb3VsZCBub3Qgb3BlbiByZXNvbHZlLUNoYW5nZUxvZ3Mgc2NyaXB0OiAkIS5cbiI7Cisg ICAgcmVzb2x2ZUNoYW5nZUxvZ3MoQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSBpZiBAY29uZmxpY3Rl ZENoYW5nZUxvZ3M7CisKKyAgICAjIFRPRE86IERlYWwgd2l0aCBjaGFuZ2Vsb2dzIHRoYXQgY291 bGQgbm90IGJlIHJlc29sdmVkLCBvciBvdGhlciBjb25mbGljdGluZyBmaWxlcworfQorCitzdWIg cnVuR2l0UmViYXNlCit7CisgICAgbXkgKCRyZWYsICRjb250aW51ZSkgPSBAXzsKKworICAgIG15 IEBjb25mbGljdGVkQ2hhbmdlTG9nczsKKyAgICBteSBAY29uZmxpY3RlZE90aGVyRmlsZXM7CisK KyAgICAjIE1ha2Ugc3VyZSB0aGVyZSBhcmUgbm8gdW5zdGFnZWQgZmlsZXMgYmVmb3JlIHRyeWlu ZyBhIHJlYmFzZSAtLWNvbnRpbnVlCisgICAgaWYgKCRjb250aW51ZSkgeworICAgICAgICBteSAk dW5zdGFnZWQgPSBgZ2l0IHVwZGF0ZS1pbmRleCAtLWlnbm9yZS1zdWJtb2R1bGVzIC0tcmVmcmVz aGA7CisgICAgICAgIGlmICgkdW5zdGFnZWQgPX4gbS9eKC4rPyk6IG5lZWRzIG1lcmdlJC8pIHsK KyAgICAgICAgICAgIG15ICRmaWxlbmFtZSA9IG5vcm1hbGl6ZVBhdGgoJDEpOworICAgICAgICAg ICAgaWYgKGJhc2VuYW1lKCRmaWxlbmFtZSkgZXEgIkNoYW5nZUxvZyIpIHsKKyAgICAgICAgICAg ICAgICBwdXNoIEBjb25mbGljdGVkQ2hhbmdlTG9ncywgJGZpbGVuYW1lOworICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICBwdXNoIEBjb25mbGljdGVkT3RoZXJGaWxlcywgJGZp bGVuYW1lOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgaWYgKEBjb25mbGlj dGVkQ2hhbmdlTG9ncyBvciBAY29uZmxpY3RlZE90aGVyRmlsZXMpIHsKKyAgICAgICAgICAgIHJl dHVybiAoXEBjb25mbGljdGVkQ2hhbmdlTG9ncywgXEBjb25mbGljdGVkT3RoZXJGaWxlcyk7Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICBvcGVuIFJFQkFTRSwgIi18IiwgImdpdCIsICJyZWJhc2Ui LCAoJGNvbnRpbnVlID8gIi0tY29udGludWUiIDogJHJlZiApIG9yIGRpZTsKKyAgICB3aGlsZSAo bXkgJGxpbmUgPSA8UkVCQVNFPikgeworICAgICAgICBwcmludCAkbGluZTsKKyAgICAgICAgaWYg KCRsaW5lID1+IG0vOiBNZXJnZSBjb25mbGljdCBpbiAoLis/KSQvKSB7CisgICAgICAgICAgICBt eSAkZmlsZW5hbWUgPSBub3JtYWxpemVQYXRoKCQxKTsKKyAgICAgICAgICAgIGlmIChiYXNlbmFt ZSgkZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAY29u ZmxpY3RlZENoYW5nZUxvZ3MsICRmaWxlbmFtZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgcHVzaCBAY29uZmxpY3RlZE90aGVyRmlsZXMsICRmaWxlbmFtZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KKyAgICBjbG9zZSBSRUJBU0U7CisKKyAgICByZXR1 cm4gKFxAY29uZmxpY3RlZENoYW5nZUxvZ3MsIFxAY29uZmxpY3RlZE90aGVyRmlsZXMpOwogfQog CiBzdWIgcnVuR2l0VXBkYXRlKCkKIHsKLSAgICBzeXN0ZW0oImdpdCIsICJzdm4iLCAicmViYXNl IikgPT0gMCBvciBkaWU7CisgICAgbXkgJHVuc3RhZ2VkID0gYGdpdCB1cGRhdGUtaW5kZXggLS1p Z25vcmUtc3VibW9kdWxlcyAtLXJlZnJlc2hgOworICAgIGRpZSAiWW91IGhhdmUgdW5zdGFnZWQg Y2hhbmdlcywgcGxlYXNlIHN0YXNoIGJlZm9yZSB1cGRhdGluZ1xuIiBpZiAkPzsKKworICAgIG15 ICRzdGFnZWQgPSBgZ2l0IGRpZmYtaW5kZXggLS1jYWNoZWQgLS1uYW1lLXN0YXR1cyAtciAtLWln bm9yZS1zdWJtb2R1bGVzIEhFQUQgLS1gOworICAgIGRpZSgiWW91IGhhdmUgc3RhZ2VkIGNoYW5n ZXMsIHBsZWFzZSBzdGFzaCBiZWZvcmUgdXBkYXRpbmdcbiIpIGlmICRzdGFnZWQ7CisKKyAgICAj IFJlc29sdmUgdGhlIGdpdC1zdm4gcmVmIG5hbWUKKyAgICBteSBAcmVmc3BlYyA9IHNwbGl0KC86 LywgYGdpdCBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2hgKTsKKyAgICBteSAkc3Zu X3JlZiA9IEByZWZzcGVjID4gMSA/ICRyZWZzcGVjWzFdIDogdW5kZWY7CisgICAgY2hvbXAoJHN2 bl9yZWYpIGlmICRzdm5fcmVmOworCisgICAgbXkgJG1pcnJvcl9yZWYgPSB1bmRlZjsKKworICAg ICMgQ2hlY2sgdGhlIGdpdCBjb25maWcgZm9yIGEgcG9zc2libGUgbWlycm9yIHJlbW90ZSB3ZSBj YW4gdXNlCisgICAgbXkgJHJlbW90ZXMgPSBgZ2l0IGNvbmZpZyAtLWdldC1yZWdleHAgIl5yZW1v dGVcLi4rXC51cmwiYDsKKyAgICBpZiAoJHJlbW90ZXMgPX4gL15yZW1vdGVcLiguKj8pXC51cmwg Lio/XC93ZWJraXRcLmdpdCQvbWkpIHsKKyAgICAgICAgbXkgJG1pcnJvciA9ICQxOworICAgICAg ICBAcmVmc3BlYyA9IHNwbGl0KC86LywgYGdpdCBjb25maWcgLS1nZXQgcmVtb3RlLiRtaXJyb3Iu ZmV0Y2hgKTsKKyAgICAgICAgaWYgKEByZWZzcGVjID4gMSkgeworICAgICAgICAgICAgJG1pcnJv cl9yZWYgPSAkcmVmc3BlY1sxXTsKKyAgICAgICAgICAgIGNob21wKCRtaXJyb3JfcmVmKTsKKyAg ICAgICAgICAgICRtaXJyb3JfcmVmID1+IHMvXCokL21hc3Rlci87CisKKyAgICAgICAgICAgICMg RmV0Y2ggbGF0ZXN0IGNoYW5nZXMgZnJvbSB0aGUgbWlycm9yIGZpcnN0LCBzaW5jZSBpdCdzIGZh c3RlcgorICAgICAgICAgICAgc3lzdGVtKCJnaXQiLCAiZmV0Y2giLCAkbWlycm9yKSA9PSAwIG9y IGRpZTsKKworICAgICAgICAgICAgaWYgKCRzdm5fcmVmKSB7CisgICAgICAgICAgICAgICAgIyBG YXN0IGZvcndhcmQgdGhlIGdpdC1zdm4gcmVmIGlmIHRoZSBtaXJyb3IgaXMgbW9yZSByZWNlbnQK KyAgICAgICAgICAgICAgICBteSAkY2hlcnJ5ID0gYGdpdCBjaGVycnkgJHN2bl9yZWYgJG1pcnJv cl9yZWZgOworCisgICAgICAgICAgICAgICAgaWYgKCRjaGVycnkgPX4gL15bK3wtXS8pIHsKKyAg ICAgICAgICAgICAgICAgICAgbXkgJGxhdGVzdF9taXJyb3Jfc2hhID0gYGdpdCByZXYtcGFyc2Ug JG1pcnJvcl9yZWZgOworICAgICAgICAgICAgICAgICAgICBjaG9tcCgkbGF0ZXN0X21pcnJvcl9z aGEpOworICAgICAgICAgICAgICAgICAgICBzeXN0ZW0oImdpdCIsICJ1cGRhdGUtcmVmIiwgJHN2 bl9yZWYsICRsYXRlc3RfbWlycm9yX3NoYSkgPT0gMCBvciBkaWU7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCRzdm5fcmVmKSB7 CisgICAgICAgICMgRmV0Y2ggbGF0ZXN0IGNoYW5nZXMgZnJvbSBTVk4gKHRoZSBtaXJyb3IgbWF5 IGJlIGEgZmV3IG1pbnV0ZXMgb2xkKQorICAgICAgICBzeXN0ZW0oImdpdCIsICJzdm4iLCAiZmV0 Y2giKTsKKyAgICB9CisKKyAgICBteSAkcmViYXNlX3JlZiA9ICRzdm5fcmVmID8gJHN2bl9yZWYg OiAkbWlycm9yX3JlZjsKKyAgICBpZiAoISRyZWJhc2VfcmVmKSB7CisgICAgICAgIGRpZSAiQ291 bGQgbm90IGZpbmQgYSBzdWl0YWJsZSByZW1vdGUgYnJhbmNoIHRvIHJlYmFzZSBhZ2FpbnN0Llxu IjsKKyAgICB9CisKKyAgICAjIERvIHJlYmFzZQorICAgIG15ICgkY29uZmxpY3RlZENoYW5nZUxv Z3MsICRjb25mbGljdGVkT3RoZXJGaWxlcykgPSBydW5HaXRSZWJhc2UoJHJlYmFzZV9yZWYpOwor ICAgIGlmIChAJGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSB7CisgICAgICAgIHJlc29sdmVDaGFuZ2VM b2dzKEAkY29uZmxpY3RlZENoYW5nZUxvZ3MpOworICAgICAgICAoJGNvbmZsaWN0ZWRDaGFuZ2VM b2dzLCAkY29uZmxpY3RlZE90aGVyRmlsZXMpID0gcnVuR2l0UmViYXNlKCRyZWJhc2VfcmVmLCAx KTsKKyAgICB9CisKKyAgICAjIERlYWwgd2l0aCBjaGFuZ2Vsb2dzIHRoYXQgZmFpbGVkIHRvIHJl c29sdmUsIG9yIG90aGVyIGNvbmZsaWN0aW5nIGZpbGVzCisgICAgaWYgKEAkY29uZmxpY3RlZENo YW5nZUxvZ3Mgb3IgQCRjb25mbGljdGVkT3RoZXJGaWxlcykgeworICAgICAgICBwcmludCAiVGhl IGZvbGxvd2luZyBmaWxlKHMpIG5lZWQgbWFudWFsIHJlc29sdmluZzpcbiI7CisgICAgICAgIGZv cmVhY2ggbXkgJGZpbGUgKEAkY29uZmxpY3RlZENoYW5nZUxvZ3MsIEAkY29uZmxpY3RlZE90aGVy RmlsZXMpIHsKKyAgICAgICAgICAgIHByaW50ICJcdCRmaWxlXG4iOworICAgICAgICB9CisgICAg ICAgIHByaW50ICJcbiI7CisgICAgICAgIGV4aXQoMSk7CisgICAgfQogfQo=