[Webkit-unassigned] [Bug 83702] New: resolve-ChangeLogs incorrectly duplicates entries landed via CQ

[bugzilla-daemon at webkit.org]

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

           Summary: resolve-ChangeLogs incorrectly duplicates entries
                    landed via CQ
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: fischman at chromium.org


Whenever CQ lands a patch of mine and I [git pull --rebase origin] to pull the CQ-landed patch into my local branch (and presumably return said local branch to pristine state matching origin) the code diff is rebased away to nothing, but I always also get a duplicate ChangeLog entry at the top of the file (in addition to the correctly-placed one in mid-file from origin).  I've got the O/A/B version of the merge.changelog.driver config from http://trac.webkit.org/wiki/UsingGitWithWebKit#WebKitScriptsupportforGit set up:

[merge "changelog"]
    driver = perl /home/fischman/src/chromium/src/third_party/WebKit/Tools/Scripts/resolve-ChangeLogs --merge-driver %O %A %B

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