Commit 318b030f authored by eric@webkit.org's avatar eric@webkit.org
Browse files

2010-06-04 Tony Gentilcore <tonyg@chromium.org>

        Reviewed by Ojan Vafai.

        Rename 'svn_merge_base' -> 'remote_merge_base'. This was left out of r60633.
        https://bugs.webkit.org/show_bug.cgi?id=40183

        * Scripts/webkitpy/tool/steps/preparechangelog.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a561090f
2010-06-04 Tony Gentilcore <tonyg@chromium.org>
Reviewed by Ojan Vafai.
Rename 'svn_merge_base' -> 'remote_merge_base'. This was left out of r60633.
https://bugs.webkit.org/show_bug.cgi?id=40183
* Scripts/webkitpy/tool/steps/preparechangelog.py:
2010-06-04 Martin Robinson <mrobinson@igalia.com>
Unreviewed.
......
......@@ -56,7 +56,7 @@ class PrepareChangeLog(AbstractStep):
if self._options.email:
args.append("--email=%s" % self._options.email)
if self._tool.scm().should_squash(self._options.squash):
args.append("--merge-base=%s" % self._tool.scm().svn_merge_base())
args.append("--merge-base=%s" % self._tool.scm().remote_merge_base())
if self._options.git_commit:
args.append("--git-commit=%s" % self._options.git_commit)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment