[Webkit-unassigned] [Bug 36257] git merge-driver not getting triggered enough?

[bugzilla-daemon at webkit.org]

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


Chris Jerdonek <cjerdonek at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|REGRESSION: svn-apply does  |git merge-driver not
                   |not handle overlapping      |getting triggered enough?
                   |diffs?                      |
                 CC|                            |vestbo at webkit.org




--- Comment #9 from Chris Jerdonek <cjerdonek at webkit.org>  2010-03-20 14:30:56 PST ---
I think I can reproduce the issue that happened here now--

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

The problem doesn't seem to be with svn-apply.  The problem seems to be that
the git merge-driver isn't getting triggered in a case in which we'd like it to
be triggered.

Steps to reproduce below:

git checkout master
git checkout -b test-repo
# The next line sets us back to the problem commit: r56231.
git reset --hard 9c004bfcc6b9c69e03215705ca335d0cf05ce06b
git checkout -b test-36352
git rebase --onto HEAD~6 HEAD~1
# test-36352 is now at the state it was in when submitting the patch.

git checkout test-repo
git reset --hard 728f779e22b395b93abe2aabadf22db36aeaabb3
# test-repo is now at the state it was in (r56230) prior to committing.

git checkout test-36352

git diff HEAD^

# shows what was getting committed--

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6af3810..1371f5d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,21 @@

         Reviewed by Adam Barth.

+        Add basic "who-broke-it" command and revision -> broken builder
association code
+        https://bugs.webkit.org/show_bug.cgi?id=36352
+
+        The "what-broke" command prints builders and what revisions we suspect
+        broke them.  who-broke-it prints revisions and what builders we
suspect
+        they broke.  The sheriff-bot needs this revision to broken builder
mapping
+        so this change adds it!
+
+        * Scripts/webkitpy/buildbot.py:
+        * Scripts/webkitpy/commands/queries.py:
+
+2010-03-19  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Simplify BuildBot core builder code for easier re-use
         https://bugs.webkit.org/show_bug.cgi?id=36350


# Rebasing with the test-repo reproduces the issue...
#
# The git merge-driver doesn't get triggered, so resolve-Changelogs never
# gets called, and the ChangeLog entry gets inserted into the middle.
# Perhaps because the overlap is large enough (4 lines in this case as you
# can see above), the ChangeLog diff gets applied cleanly enough so as
# not to trigger a merge scenario.

git rebase test-repo

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