[Webkit-unassigned] [Bug 38274] New: webkit-patch should suggest updating to trunk

[bugzilla-daemon at webkit.org]

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

           Summary: webkit-patch should suggest updating to trunk
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: evan at chromium.org


$ git checkout HEAD~6   # or some other thing that gets you in this state

$ hack hack hack

$ webkit-patch upload MYBUGNUM
Are you sure you want to continue? [Y/n]: 
There are 6 local commits and working copy changes. Do one of the following:
1) Use --squash or --no-squash
2) git config webkit-patch.squash true/false

There are 6 local commits and working copy changes. Do one of the following:
1) Use --squash or --no-squash
2) git config webkit-patch.squash true/false

====

So (a) the error message is confusing (I don't have 6 local commits), and
(b) it could perhaps suggest rebasing onto origin or whatever.

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