[webkit-dev] changelogs: a reprise

[Eric Seidel]

Soon after that I wrote bugzilla-tool (now called webkit-patch).  Adam
Barth and I learned that webkit-patch made it easy to just "save"
patches to bugs, using post and apply-attachment.  That was easier
than bothering with branches in many cases (at least branches
containing ChangeLogs).

It's even easier for me to avoid storing changelogs now that "upload"
prompts me to write them when I finally do post the patch.

On Tue, Jan 26, 2010 at 10:19 AM, Chris Jerdonek <cjerdonek at webkit.org> wrote:
> On Tue, Jan 26, 2010 at 9:55 AM, David Kilzer <ddkilzer at webkit.org> wrote:
>>
>> I think I mentioned this before, but for git users, this can be solved in the short term by a merge driver that uses resolve-ChangeLogs (once it knows how to be invoked by git as a merge driver):
>
> This seems like a good idea.
>
>> I started hacking on resolve-ChangeLogs to be invoked by three arguments this way, but haven't had time to finish it.
>
> I came across this report:
>
> https://bugs.webkit.org/show_bug.cgi?id=28721
>
> "I looked briefly at writing this today.  The merge driver is passed paths to 3
> temp files.  1. previous version 2. other branch version.  3.  this branch
> version.  Maybe one of the other WebKit git users will get further than I did."
>
> Looks like you and Eric might want to connect. ;)
>
> --Chris
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>