[Webkit-unassigned] [Bug 38852] New: webkit-patch land --squash commits too much if branch is not up to date
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Mon May 10 09:37:29 PDT 2010
https://bugs.webkit.org/show_bug.cgi?id=38852
Summary: webkit-patch land --squash commits too much if branch
is not up to date
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: ojan at chromium.org
CC: eric at webkit.org, cjerdonek at webkit.org
Specifically, if trunk has been updated (e.g. git svn fetch), but the branch hasn't been rebases/merged to trunk, then squash will commit the whole diff from trunk. We should do our best to detect this case and bail. I think a simple check that the top commit on trunk is present in the branch is sufficient.
This is almost definitely the cause of https://bugs.webkit.org/show_bug.cgi?id=38798.
--
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
More information about the webkit-unassigned
mailing list