21418 2008-10-06 16:54:27 -0700 resolve-ChangeLogs should have a --continue option which does git rebase --continue 2009-06-01 16:28:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 26124 1 eric ddkilzer aroben ddkilzer dglazkov evan ojan oldest_to_newest 94295 0 eric 2008-10-06 16:54:27 -0700 resolve-ChangeLogs should have a --continue option which does git rebase --continue The name is debateable. But I find myself doing this: resolve-ChangeLogs WebCore/ChangeLog LayoutTests/ChangeLog && git rebase --continue *all the time* 94760 1 ddkilzer 2008-10-09 13:06:55 -0700 (In reply to comment #0) > *all the time* I've never done this. Can you describe the process in which this happens? Obviously you're doing some kind of a git-rebase operation, but I'm curious if you're preventing git from merging (because it screws it up; see Bug 21457) or because it's constantly getting merge conflicts on ChangeLog files during the rebase operation. 120954 2 30255 ddkilzer 2009-05-12 17:21:10 -0700 Created attachment 30255 Patch v1 120955 3 eric 2009-05-12 17:25:31 -0700 Yay! sooo excited! 120956 4 ddkilzer 2009-05-12 17:32:07 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r43601 http://trac.webkit.org/changeset/43601 121046 5 ddkilzer 2009-05-13 09:36:26 -0700 Follow-up fix for Subversion users: $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r43636 http://trac.webkit.org/changeset/43636 121047 6 dglazkov 2009-05-13 09:45:27 -0700 Gorgeous. I hugs you. 123889 7 eric 2009-06-01 16:17:38 -0700 Hum... looks like it somehow confused vim for me today: eseidel-mac [6520:WebKit]% resolve-ChangeLogs -c [~/Projects/WebKit] M WebCore/ChangeLog Running 'git rebase --continue'... Vim: Warning: Output is not to a terminal And the terminal is hung. ;) 123890 8 eric 2009-06-01 16:28:12 -0700 Yup. Turns out if git rebase --continue needs to open up a vim window, resolve-ChangeLogs -c hangs. :( I'll file a bug. 30255 2009-05-12 17:21:10 -0700 2009-05-12 17:23:21 -0700 Patch v1 bug-21418-resolve-ChangeLogs--continue.txt text/plain 3910 ddkilzer Y29tbWl0IDdjMjdkNWM2OTc4NGNhM2ExMDY1ODBlNjIzM2QwYTcxMjdmM2FlOWQKQXV0aG9yOiBE YXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0ZTogICBUdWUgTWF5IDEyIDE0OjE4 OjM2IDIwMDkgLTA3MDAKCiAgICAgICAgICAgIEJ1ZyAyMTQxODogcmVzb2x2ZS1DaGFuZ2VMb2dz IHNob3VsZCBoYXZlIGEgLS1jb250aW51ZSBvcHRpb24gd2hpY2ggZG9lcyBnaXQgcmViYXNlIC0t Y29udGludWUKICAgIAogICAgICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNDE4PgogICAgCiAgICAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgogICAgCiAgICAgICAgICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3M6IEFkZGVk IC1jfC0tY29udGludWUgc3dpdGNoIHRoYXQKICAgICAgICAgICAgcnVucyAiZ2l0IHJlYmFzZSAt LWNvbnRpbnVlIiBiZWZvcmUgZXhpdGluZyB0aGUgc2NyaXB0LgogICAgICAgICAgICAoaGFzR2l0 VW5tZXJnZWRGaWxlcyk6IEFkZGVkLiAgUmV0dXJucyB0cnVlIGlmIHRoZXJlIGFyZQogICAgICAg ICAgICB1bm1lcmdlZCBmaWxlcyBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkuCgpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGU3MDhl NjEuLmVlOTk1ZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJL aXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wNS0xMiAgRGF2aWQgS2ls emVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEJ1ZyAyMTQxODogcmVzb2x2ZS1D aGFuZ2VMb2dzIHNob3VsZCBoYXZlIGEgLS1jb250aW51ZSBvcHRpb24gd2hpY2ggZG9lcyBnaXQg cmViYXNlIC0tY29udGludWUKKworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3M6IEFkZGVkIC1jfC0tY29u dGludWUgc3dpdGNoIHRoYXQKKyAgICAgICAgcnVucyAiZ2l0IHJlYmFzZSAtLWNvbnRpbnVlIiBi ZWZvcmUgZXhpdGluZyB0aGUgc2NyaXB0LgorICAgICAgICAoaGFzR2l0VW5tZXJnZWRGaWxlcyk6 IEFkZGVkLiAgUmV0dXJucyB0cnVlIGlmIHRoZXJlIGFyZQorICAgICAgICB1bm1lcmdlZCBmaWxl cyBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkuCisKIDIwMDktMDUtMTEgIExhc3psbyBHb21ib3MgIDxs YXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdlciBG cmV5dGhlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VM b2dzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKaW5kZXggOTY2NmYy Zi4uMTM0ZWM0OSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5n ZUxvZ3MKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MKQEAgLTQ2 LDYgKzQ2LDcgQEAgc3ViIGZpbmRVbm1lcmdlZENoYW5nZUxvZ3MoKTsKIHN1YiBmaXhDaGFuZ2VM b2dQYXRjaCgkKTsKIHN1YiBmaXhNZXJnZWRDaGFuZ2VMb2dzKCQ7QCk7CiBzdWIgZml4T25lTWVy Z2VkQ2hhbmdlTG9nKCQpOworc3ViIGhhc0dpdFVubWVyZ2VkRmlsZXMoKTsKIHN1YiBtZXJnZUNo YW5nZXMoJCQkKTsKIHN1YiBwYXJzZUZpeE1lcmdlZCgkJDskKTsKIHN1YiByZW1vdmVDaGFuZ2VM b2dBcmd1bWVudHMoKTsKQEAgLTYxLDEwICs2MiwxMiBAQCBteSAkU1ZOID0gInN2biI7CiBteSAk R0lUID0gImdpdCI7CiAKIG15ICRmaXhNZXJnZWQ7CitteSAkZ2l0UmViYXNlQ29udGludWUgPSAw OwogbXkgJHByaW50V2FybmluZ3MgPSAxOwogbXkgJHNob3dIZWxwOwogCiBteSAkZ2V0T3B0aW9u c1Jlc3VsdCA9IEdldE9wdGlvbnMoCisgICAgJ2N8Y29udGludWUhJyAgICA9PiBcJGdpdFJlYmFz ZUNvbnRpbnVlLAogICAgICdmfGZpeC1tZXJnZWQ6cycgPT4gXCZwYXJzZUZpeE1lcmdlZCwKICAg ICAnaHxoZWxwJyAgICAgICAgID0+IFwkc2hvd0hlbHAsCiAgICAgJ3d8d2FybmluZ3MhJyAgICA9 PiBcJHByaW50V2FybmluZ3MsCkBAIC04Miw2ICs4NSw5IEBAIGlmIChzY2FsYXIoQEFSR1YpID4g MCkgewogfSBlbHNpZiAoIWRlZmluZWQgJGZpeE1lcmdlZCAmJiBzY2FsYXIoQGNoYW5nZUxvZ0Zp bGVzKSA9PSAwKSB7CiAgICAgcHJpbnQgU1RERVJSICJFUlJPUjogTm8gQ2hhbmdlTG9nIGZpbGVz IGxpc3RlZCBvbiBjb21tYW5kLWxpbmUgb3IgZm91bmQgdW5tZXJnZWQuXG4iOwogICAgIHVuZGVm ICRnZXRPcHRpb25zUmVzdWx0OworfSBlbHNpZiAoZGVmaW5lZCAkZ2l0UmViYXNlQ29udGludWUg JiYgISRpc0dpdCkgeworICAgIHByaW50IFNUREVSUiAiRVJST1I6IC0tY29udGludWUgbWF5IG9u bHkgYmUgdXNlZCB3aXRoIGEgZ2l0IHJlcG9zaXRvcnlcbiI7CisgICAgdW5kZWYgJGdldE9wdGlv bnNSZXN1bHQ7CiB9IGVsc2lmIChkZWZpbmVkICRmaXhNZXJnZWQgJiYgISRpc0dpdCkgewogICAg IHByaW50IFNUREVSUiAiRVJST1I6IC0tZml4LW1lcmdlZCBtYXkgb25seSBiZSB1c2VkIHdpdGgg YSBnaXQgcmVwb3NpdG9yeVxuIjsKICAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKQEAgLTkx LDYgKzk3LDggQEAgc3ViIHVzYWdlQW5kRXhpdCgpCiB7CiAgICAgcHJpbnQgU1RERVJSIDw8X19F TkRfXzsKIFVzYWdlOiBAe1sgYmFzZW5hbWUoJDApIF19IFtvcHRpb25zXSBbcGF0aC90by9DaGFu Z2VMb2ddIFtwYXRoL3RvL2Fub3RoZXIvQ2hhbmdlTG9nIC4uLl0KKyAgLWN8LS1bbm8tXWNvbnRp bnVlICAgICAgICAgICAgICAgcnVuICJnaXQgcmViYXNlIC0tY29udGludWUiIGFmdGVyIGZpeGlu ZyBDaGFuZ2VMb2cKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50cmllcyAo ZGVmYXVsdDogLS1uby1jb250aW51ZSkKICAgLWZ8LS1maXgtbWVyZ2VkIFtyZXZpc2lvbi1yYW5n ZV0gZml4IGdpdC1tZXJnZWQgQ2hhbmdlTG9nIGVudHJpZXM7IGlmIGEgcmV2aXNpb24tcmFuZ2UK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXMgc3BlY2lmaWVkLCBydW4gZ2l0 IGZpbHRlci1icmFuY2ggb24gdGhlIHJhbmdlCiAgIC1ofC0taGVscCAgICAgICAgICAgICAgICAg ICAgICAgIHNob3cgdGhpcyBoZWxwIG1lc3NhZ2UKQEAgLTEyMCw2ICsxMjgsMTUgQEAgaWYgKGRl ZmluZWQgJGZpeE1lcmdlZCAmJiBsZW5ndGgoJGZpeE1lcmdlZCkgPiAwKSB7CiAgICAgdXNhZ2VB bmRFeGl0KCk7CiB9CiAKK2lmICgkZ2l0UmViYXNlQ29udGludWUpIHsKKyAgICBpZiAoaGFzR2l0 VW5tZXJnZWRGaWxlcygpKSB7CisgICAgICAgIHByaW50ICJVbm1lcmdlZCBmaWxlczsgc2tpcHBp bmcgJyRHSVQgcmViYXNlIC0tY29udGludWUnLiI7CisgICAgfSBlbHNlIHsKKyAgICAgICAgcHJp bnQgIlJ1bm5pbmcgJyRHSVQgcmViYXNlIC0tY29udGludWUnLi4uXG4iOworICAgICAgICBwcmlu dCBgJEdJVCByZWJhc2UgLS1jb250aW51ZWA7CisgICAgfQorfQorCiBleGl0IDA7CiAKIHN1YiBj b25mbGljdEZpbGVzKCQpCkBAIC0zODAsNiArMzk3LDEyIEBAIHN1YiBmaXhPbmVNZXJnZWRDaGFu Z2VMb2coJCkKICAgICB9CiB9CiAKK3N1YiBoYXNHaXRVbm1lcmdlZEZpbGVzKCkKK3sKKyAgICBt eSAkb3V0cHV0ID0gYCRHSVQgbHMtZmlsZXMgLS11bm1lcmdlZGA7CisgICAgcmV0dXJuICRvdXRw dXQgbmUgIiI7Cit9CisKIHN1YiBtZXJnZUNoYW5nZXMoJCQkKQogewogICAgIG15ICgkZmlsZU1p bmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpID0gQF87Cg==