9964 2006-07-16 21:01:30 -0700 Add switch to prepare-ChangeLog to skip svn update of ChangeLog files 2006-07-18 19:38:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer oldest_to_newest 50115 0 ddkilzer 2006-07-16 21:01:30 -0700 With the fixes in Bug 9290, Bug 9693 and Bug 9848, there's really no need for prepare-ChangeLog to update ChangeLog files. It puts them out-of-sync with the rest of your svn tree, and it takes time to run svn update on them. 50123 1 9516 ddkilzer 2006-07-16 21:23:03 -0700 Created attachment 9516 Patch v1 This makes prepare-ChangeLog hellafast when specifying files and directories on the command line! 50137 2 timothy 2006-07-16 23:13:53 -0700 How do we deal with conflicts that result from doing a prepare-ChangeLog then doing an svn up before committing? 50152 3 darin 2006-07-17 07:52:04 -0700 (In reply to comment #2) > How do we deal with conflicts that result from doing a prepare-ChangeLog then > doing an svn up before committing? My question exactly! 50162 4 ddkilzer 2006-07-17 08:44:30 -0700 (In reply to comment #3) > (In reply to comment #2) > > How do we deal with conflicts that result from doing a > > prepare-ChangeLog then doing an svn up before committing? > My question exactly! I guess I must be missing some use cases that Apple engineers hit more frequently than open source committers. The only time I would run prepare-ChangeLog and then commit immediately would be to make a build fix or perhaps to back out a patch. Even then, it would be reasonably unlikely that someone has committed a patch between the time the build was broken and the time you commit a fix for the build. Every other (99% of the) time, I use prepare-ChangeLog before svn-create-patch, then post the patch for review to Bugzilla. Can you describe what scenarios would cause problems if this code was removed? (If not, ignore this question.) In place of removing the code, how about a command-line switch to turn the behavior on or off? I would like it to be off by default (with a -u or --update switch to update ChangeLogs), but I could live with it being on by default and adding the ability to specify --no-update to turn it off. Thoughts? 50224 5 timothy 2006-07-17 19:36:51 -0700 Adding a no update flag would be ok, but doing the update needs to be on by default. A common sisuation for us is to have a patch ready that we have been working on throught the day and many other changes have landed. Sometimes these changes get reviewed in person before the ChnageLog is written. Right before we want to land we will run prepare-ChangeLog, edit the ChangeLog then commit. If the ChangeLog was not updated before we commit we will have to resolve the changelog manually. 50225 6 9516 darin 2006-07-17 19:38:58 -0700 Comment on attachment 9516 Patch v1 Please let it be on by default. We can consider changing the default later. 50229 7 9536 ddkilzer 2006-07-17 20:15:57 -0700 Created attachment 9536 Patch v2 Adds --[no-]update switch to disable svn update of ChangeLogs if desired.  Updating is enabled by default by popular demand.  :) 50312 8 ddkilzer 2006-07-18 19:38:15 -0700 Committed revision 15516. 9516 2006-07-16 21:23:03 -0700 2006-07-17 20:15:57 -0700 Patch v1 bug-9964-v1.diff text/plain 1280 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDc4KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDYtMDctMTYgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVn LmNnaT9pZD05OTY0CisgICAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cgbm8gbG9uZ2VyIG5lZWRz IHRvIHJ1biBzdm4gdXBkYXRlIG9uIENoYW5nZUxvZyBmaWxlcworCisgICAgICAgICogU2NyaXB0 cy9wcmVwYXJlLUNoYW5nZUxvZzogRG9uJ3QgcnVuIHN2biB1cGRhdGUgYmVmb3JlIGFkZGluZyBD aGFuZ2VMb2cgZW50cmllcy4KKwogMjAwNi0wNy0xNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJA a2lsemVyLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4KSW5kZXg6IFdlYktpdFRv b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwkocmV2aXNpb24gMTU0NjcpCisrKyBXZWJLaXRUb29s cy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0yODksMTMgKzI4 OSw2IEBAIGZvcmVhY2ggbXkgJHByZWZpeCAoc29ydCBrZXlzICVmaWxlcykKICAgewogICAgICRs b2dzIC49ICIgJHtwcmVmaXh9Q2hhbmdlTG9nIjsKICAgfQotaWYgKCRsb2dzKQotICB7Ci0gICAg cHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgJ3N2biB1cGRhdGUnIHRvIHVwZGF0ZSBDaGFuZ2VMb2cg ZmlsZXMuXG4iOwotICAgIG9wZW4gRVJST1JTLCAiJFNWTiB1cGRhdGUgLXEkbG9ncyB8IiBvciBk aWUgIlRoZSBzdm4gdXBkYXRlIG9mIENoYW5nZUxvZyBmaWxlcyBmYWlsZWQ6ICQhLlxuIjsKLSAg ICBwcmludCBTVERFUlIgIiAgICAkXyIgd2hpbGUgPEVSUk9SUz47Ci0gICAgY2xvc2UgRVJST1JT OwotICB9CiAKICMgV3JpdGUgb3V0IGEgbmV3IENoYW5nZUxvZyBmaWxlLgogZm9yZWFjaCBteSAk cHJlZml4IChzb3J0IGtleXMgJWZpbGVzKQo= 9536 2006-07-17 20:15:57 -0700 2006-07-18 08:30:50 -0700 Patch v2 bug-9964-v2.diff text/plain 2245 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDk1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDYtMDctMTcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVn LmNnaT9pZD05OTY0CisgICAgICAgICAgQWRkIHN3aXRjaCB0byBwcmVwYXJlLUNoYW5nZUxvZyB0 byBza2lwIHN2biB1cGRhdGUgb2YgQ2hhbmdlTG9nIGZpbGVzCisKKyAgICAgICAgKiBTY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nOiBBZGRlZCAtLVtuby1ddXBkYXRlIHN3aXRjaC4KKwogMjAwNi0w Ny0xNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAa2lsemVyLm5ldD4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbi4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwko cmV2aXNpb24gMTU0OTUpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC02NywxNyArNjcsMjAgQEAgc3ViIHByb2Nlc3NQYXRocyhcQCk7 CiAKIG15ICRvcGVuQ2hhbmdlTG9ncyA9IDA7CiBteSAkc2hvd0hlbHAgPSAwOworbXkgJHVwZGF0 ZUNoYW5nZUxvZ3MgPSAxOwogbXkgJHNwZXdEaWZmID0gJEVOVnsiUFJFUEFSRV9DSEFOR0VMT0df RElGRiJ9OwogbXkgJHBhcnNlT3B0aW9uc1Jlc3VsdCA9CiAgICAgR2V0T3B0aW9ucygiZGlmZnxk ISIgPT4gXCRzcGV3RGlmZiwKICAgICAgICAgICAgICAgICJoZWxwfGghIiA9PiBcJHNob3dIZWxw LAotICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MpOworICAgICAg ICAgICAgICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCisgICAgICAgICAgICAgICAi dXBkYXRlISIgPT4gXCR1cGRhdGVDaGFuZ2VMb2dzKTsKIGlmICghJHBhcnNlT3B0aW9uc1Jlc3Vs dCB8fCAkc2hvd0hlbHApCiAgIHsKICAgICBwcmludCBTVERFUlIgYmFzZW5hbWUoJDApIC4gIiBb LWR8LS1kaWZmXSBbLWh8LS1oZWxwXSBbLW98LS1vcGVuXSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5d XVxuIjsKLSAgICBwcmludCBTVERFUlIgIiAgLWR8LS1kaWZmICBTcGV3IGRpZmYgdG8gc3Rkb3V0 IHdoZW4gcnVubmluZ1xuIjsKLSAgICBwcmludCBTVERFUlIgIiAgLWh8LS1oZWxwICBTaG93IHRo aXMgaGVscCBtZXNzYWdlXG4iOwotICAgIHByaW50IFNUREVSUiAiICAtb3wtLW9wZW4gIE9wZW4g Q2hhbmdlTG9ncyBpbiBhbiBlZGl0b3Igd2hlbiBkb25lXG4iOworICAgIHByaW50IFNUREVSUiAi ICAtZHwtLWRpZmYgICAgICBTcGV3IGRpZmYgdG8gc3Rkb3V0IHdoZW4gcnVubmluZ1xuIjsKKyAg ICBwcmludCBTVERFUlIgIiAgLWh8LS1oZWxwICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZVxu IjsKKyAgICBwcmludCBTVERFUlIgIiAgLW98LS1vcGVuICAgICAgT3BlbiBDaGFuZ2VMb2dzIGlu IGFuIGVkaXRvciB3aGVuIGRvbmVcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV11cGRh dGUgIFVwZGF0ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9yZSBhZGRpbmcgZW50cnkgKGRlZmF1 bHQ6IHVwZGF0ZSlcbiI7CiAgICAgZXhpdCAxOwogICB9CiAKQEAgLTI4OSw3ICsyOTIsNyBAQCBm b3JlYWNoIG15ICRwcmVmaXggKHNvcnQga2V5cyAlZmlsZXMpCiAgIHsKICAgICAkbG9ncyAuPSAi ICR7cHJlZml4fUNoYW5nZUxvZyI7CiAgIH0KLWlmICgkbG9ncykKK2lmICgkbG9ncyAmJiAkdXBk YXRlQ2hhbmdlTG9ncykKICAgewogICAgIHByaW50IFNUREVSUiAiICBSdW5uaW5nICdzdm4gdXBk YXRlJyB0byB1cGRhdGUgQ2hhbmdlTG9nIGZpbGVzLlxuIjsKICAgICBvcGVuIEVSUk9SUywgIiRT Vk4gdXBkYXRlIC1xJGxvZ3MgfCIgb3IgZGllICJUaGUgc3ZuIHVwZGF0ZSBvZiBDaGFuZ2VMb2cg ZmlsZXMgZmFpbGVkOiAkIS5cbiI7Cg==