[Webkit-unassigned] [Bug 48073] New: [webkit-patch] Does not land from bug when used with fast git pull / svn rebase.

[bugzilla-daemon at webkit.org]

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

           Summary: [webkit-patch] Does not land from bug when used with
                    fast git pull / svn rebase.
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Macintosh
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: pfeldman at chromium.org
                CC: eric at webkit.org, ojan at chromium.org


I modified my .git/config as suggested at http://trac.webkit.org/wiki/UsingGitWithWebKit

[svn-remote "svn"]
        url = http://svn.webkit.org/repository/webkit
        fetch = trunk:refs/remotes/origin/master

Now I can make "git pull && git svn rebase" in few seconds. However, webkit-patch land-from-bug gives me:

===============
googleio-macbookpro:WebKit pfeldman$ WebKitTools/Scripts/webkit-patch land-from-bug 48069
Fetching: https://bugs.webkit.org/show_bug.cgi?id=48069&ctype=xml
1 reviewed patch found on bug 48069.
Processing 1 patch from 1 bug.
ERROR: Working directory has local commits, pass --force-clean to continue.
===============

Now I do --force-clean, wait 15 minutes and get

===============
Fetching: https://bugs.webkit.org/show_bug.cgi?id=48069&ctype=xml
1 reviewed patch found on bug 48069.
Processing 1 patch from 1 bug.
Cleaning working directory
Updating working directory
Processing patch 71442 from bug 48069.
Reading Keychain for bugs.webkit.org account and password.  Click "Allow" to continue...
Logging in as pfeldman at chromium.org...
Parsing ChangeLog: /Users/pfeldman/WebKit/BugsSite/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/JavaScriptCore/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/JavaScriptCore/qt/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/JavaScriptGlue/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/LayoutTests/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/PlanetWebKit/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/SunSpider/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebCore/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/cf/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/chromium/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/efl/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/gtk/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/gtk/po/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/haiku/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/mac/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/qt/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/win/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/wince/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit/wx/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKit2/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKitLibraries/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKitSite/ChangeLog
Parsing ChangeLog: /Users/pfeldman/WebKit/WebKitTools/ChangeLog
There are 2600 local commits and working copy changes. Everything will be committed as a single commit. To avoid this prompt, set "git config webkit-patch.commit-should-always-squash true". [Y/n]: 
===============

It all worked fine when my config was
        fetch = trunk:refs/remotes/trunk

But svn rebase was really slow back then. I want both: fast rebase and webkit-patch please!

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