[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 14:55:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5e985490559f07f76eae694933054ee9578f39c3
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 05:29:53 2010 +0000
2010-10-24 Adam Barth <abarth at webkit.org>
Reviewed by David Kilzer.
webkit-patch upload fails when the patch removes a file
https://bugs.webkit.org/show_bug.cgi?id=48187
We need to use "--" to separate file names from the rest of the
command.
* Scripts/webkitpy/common/checkout/scm.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70437 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ad484bc..67756ac 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-24 Adam Barth <abarth at webkit.org>
+
+ Reviewed by David Kilzer.
+
+ webkit-patch upload fails when the patch removes a file
+ https://bugs.webkit.org/show_bug.cgi?id=48187
+
+ We need to use "--" to separate file names from the rest of the
+ command.
+
+ * Scripts/webkitpy/common/checkout/scm.py:
+
2010-10-24 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70413.
diff --git a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
index 4bd9ed6..5b18ea2 100644
--- a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
+++ b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
@@ -667,7 +667,7 @@ class Git(SCM):
return self._changes_files_for_commit(commit_id)
def revisions_changing_file(self, path, limit=5):
- commit_ids = self.run(["git", "log", "--pretty=format:%H", "-%s" % limit, path]).splitlines()
+ commit_ids = self.run(["git", "log", "--pretty=format:%H", "-%s" % limit, "--", path]).splitlines()
return filter(lambda revision: revision, map(self.svn_revision_from_git_commit, commit_ids))
def conflicted_files(self):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list