<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>28092</bug_id>
          
          <creation_ts>2009-08-07 19:18:02 -0700</creation_ts>
          <short_desc>webkit-patch land will land changes even if the ChangeLog is wrong (and thus make the wrong commit message)</short_desc>
          <delta_ts>2017-07-18 08:29:59 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>NEW</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Adam Barth">abarth</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>aroben</cc>
    
    <cc>cjerdonek</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>eric</cc>
    
    <cc>mrowe</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>138263</commentid>
    <comment_count>0</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2009-08-07 19:18:02 -0700</bug_when>
    <thetext>http://trac.webkit.org/changeset/46933

Not sure why.  I don&apos;t remember anything unusual happening when I ran the tool.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138359</commentid>
    <comment_count>1</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-08-08 10:25:16 -0700</bug_when>
    <thetext>This is a dupe of one of:
https://bugs.webkit.org/show_bug.cgi?id=26730
https://bugs.webkit.org/show_bug.cgi?id=26865
https://bugs.webkit.org/show_bug.cgi?id=27355</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138361</commentid>
    <comment_count>2</comment_count>
    <who name="Mark Rowe (bdash)">mrowe</who>
    <bug_when>2009-08-08 10:28:24 -0700</bug_when>
    <thetext>And in &lt;http://trac.webkit.org/changeset/46928&gt;.  Can we get this fixed so we don&apos;t have bogus commit messages sprinkled throughout the SVN history?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138375</commentid>
    <comment_count>3</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2009-08-08 10:38:55 -0700</bug_when>
    <thetext>Eric said on IRC:

eseidel: bdash: either svn-apply or bugzilla-tool need to be taught to run resolve-ChangeLogs -f on every ChangeLog

We can certainly try that and see if it helps.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138385</commentid>
    <comment_count>4</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2009-08-08 11:08:29 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; And in &lt;http://trac.webkit.org/changeset/46928&gt;.  Can we get this fixed so we
&gt; don&apos;t have bogus commit messages sprinkled throughout the SVN history?

I&apos;ve seen this happen with prepare-ChangeLog commits as well.

(In reply to comment #3)
&gt; eseidel: bdash: either svn-apply or bugzilla-tool need to be taught to run
&gt; resolve-ChangeLogs -f on every ChangeLog
&gt; 
&gt; We can certainly try that and see if it helps.

I would suggest adding an -a|--all swtich to resolve-ChangeLogs (rather than changing the behavior of the -f switch) to make it attempt to fix up every ChangeLog.

The -f switch has special behavior that rewrites changelogs on a range of git commits using git-filter-branch --tree-filter.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138388</commentid>
    <comment_count>5</comment_count>
    <who name="Mark Rowe (bdash)">mrowe</who>
    <bug_when>2009-08-08 11:13:12 -0700</bug_when>
    <thetext>(In reply to comment #4)
&gt; (In reply to comment #2)
&gt; &gt; And in &lt;http://trac.webkit.org/changeset/46928&gt;.  Can we get this fixed so we
&gt; &gt; don&apos;t have bogus commit messages sprinkled throughout the SVN history?
&gt; 
&gt; I&apos;ve seen this happen with prepare-ChangeLog commits as well.

I&apos;m not sure what you mean.  In this case it seems that the patch author put the ChangeLog at some bizarre location within the file: &lt;https://bugs.webkit.org/attachment.cgi?id=34264&amp;action=prettypatch&gt;.  Rather than fixing it up, bugzilla-tool left it in that location and took the first ChangeLog entry as the commit message.  I don&apos;t think any of our existing scripts will automagically fix this.

In &lt;http://trac.webkit.org/changeset/46933&gt; it just appears to be confused about where one ChangeLog entry ends and the second begins.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>138435</commentid>
    <comment_count>6</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2009-08-08 16:01:56 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; (In reply to comment #4)
&gt; &gt; (In reply to comment #2)
&gt; &gt; &gt; And in &lt;http://trac.webkit.org/changeset/46928&gt;.  Can we get this fixed so we
&gt; &gt; &gt; don&apos;t have bogus commit messages sprinkled throughout the SVN history?
&gt; &gt; 
&gt; &gt; I&apos;ve seen this happen with prepare-ChangeLog commits as well.
&gt; 
&gt; I&apos;m not sure what you mean.

Sorry, I should have said:  I&apos;ve seen commit-log-editor pick the wrong changelog entries, but it was probably due to the ChangeLog entry being merged into the wrong location.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>162143</commentid>
    <comment_count>7</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-11-10 11:41:37 -0800</bug_when>
    <thetext>I believe these were all caused by bug 30683, which is now resolved.  We can keep this open to track adding some sort of pre-commit hook for validating ChangeLog entries (see bug 28291) if you like.  Otherwise I think we can close this.  Certainly I&apos;m un-aware of any bad ChangeLog entries from bugzilla-tool or the commit-queue since the ones mentioned in this bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>164096</commentid>
    <comment_count>8</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-11-16 14:50:51 -0800</bug_when>
    <thetext>Looks like land-diff was at fault in all of these commits.  I was initially confused, thinking that this bug was accusing land-patches, which we&apos;ve never seen this behavior with.  http://trac.webkit.org/changeset/51033 was our most recent victim of this behavior.

I guess land-diff will need to resolve-ChangeLogs.  I&apos;ll try to look into it this week.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>207698</commentid>
    <comment_count>9</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-04-01 23:19:24 -0700</bug_when>
    <thetext>webkit-patch land will validate that the Reviewer is correct now.  However it doesn&apos;t yet validate that the ChangeLog entry being added is the top-most one.  That&apos;s still on our list to do.  It requires webkit-patch to have a bit of diff-parsing knowledge, which it should be able to get from the style package (check-webkit-style) which already has some minimal diff parsing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>207700</commentid>
    <comment_count>10</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2010-04-01 23:21:52 -0700</bug_when>
    <thetext>*** Bug 33246 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>