[Webkit-unassigned] [Bug 71262] Web Inspector: Add colorpicker functionality to color swatches in Styles Sidebar

Mon Nov 28 00:08:03 PST 2011

https://bugs.webkit.org/show_bug.cgi?id=71262

--- Comment #21 from Alexander Pavlov (apavlov) <apavlov at chromium.org>  2011-11-28 00:08:03 PST ---
(In reply to comment #20)
> Created an attachment (id=116686)
 --> (https://bugs.webkit.org/attachment.cgi?id=116686&action=review) [details]
> Updating whitespace / webkit style
> 
> This handles most of the feedback from my latest patch.  I realize there isn't a changelog entry here.  I am having a hard time generating a changelog from multiple git commits, and am not able to easily rebase now that I have merged from master.  Any tips for handling this?  I basically want to generate a changelog based on 3 or so commits, separated by multiple merged commits if that makes sense.  Here is the output when I try to generate the changelog (my last commit was reverting the latest changelog):
> 
> Tools/Scripts/prepare-ChangeLog --git-commit HEAD --bug 71262
>    Running status to find changed, added, or removed files.
>    No changes found.

Well, I usually do "git rebase master" instead of "git merge master", since rebasing is what you most likely want to do, that is, apply your current changes on top of the current master state, instead of the reverse (applying your latest master on top of you changes). Actually, "git merge" is intended for the opposite task, according to "git help merge": apply your development branch changes to the master branch (since it modifies the commits from the branch merged).

In situations like yours (branch goofed up), I usually run "git diff master > work.patch", branch off of master (e.g. git checkout -b topic master) and apply work.patch against the "topic" working copy: patch -p1 -F3 < work.patch (-F3 handles ChangeLog merges if you are having problems with them, but may ruin your source code merges if the code you have changed also got changed in "master" - use with care.) Then commit and "git show > colorpicker.patch" (you have the only commit after "master" in your "topic" branch now.)

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.