Title: [111823] trunk/Tools
- Revision
- 111823
- Author
- [email protected]
- Date
- 2012-03-22 21:10:09 -0700 (Thu, 22 Mar 2012)
Log Message
sync-master-with-upstream creates non-linear git history
https://bugs.webkit.org/show_bug.cgi?id=82006
Reviewed by Julien Chaffraix.
Previously this script would create a merge commit at the HEAD of
origin/master, causing your fork of WebKit to diverge from upstream.
The new version of this script pushes directly from upstream to origin
(without round-tripping through any local branches), avoiding this
problem.
* Scripts/sync-master-with-upstream:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111822 => 111823)
--- trunk/Tools/ChangeLog 2012-03-23 04:04:08 UTC (rev 111822)
+++ trunk/Tools/ChangeLog 2012-03-23 04:10:09 UTC (rev 111823)
@@ -1,3 +1,18 @@
+2012-03-22 Adam Barth <[email protected]>
+
+ sync-master-with-upstream creates non-linear git history
+ https://bugs.webkit.org/show_bug.cgi?id=82006
+
+ Reviewed by Julien Chaffraix.
+
+ Previously this script would create a merge commit at the HEAD of
+ origin/master, causing your fork of WebKit to diverge from upstream.
+ The new version of this script pushes directly from upstream to origin
+ (without round-tripping through any local branches), avoiding this
+ problem.
+
+ * Scripts/sync-master-with-upstream:
+
2012-03-22 Gustavo Noronha Silva <[email protected]>
Unreviewed build fix. Add knowledge of the WTF project to
Modified: trunk/Tools/Scripts/sync-master-with-upstream (111822 => 111823)
--- trunk/Tools/Scripts/sync-master-with-upstream 2012-03-23 04:04:08 UTC (rev 111822)
+++ trunk/Tools/Scripts/sync-master-with-upstream 2012-03-23 04:10:09 UTC (rev 111823)
@@ -26,8 +26,8 @@
# This script is intended to support the GitHub workflow described here:
# https://trac.webkit.org/wiki/UsingGitHub
#
-# This script fetches the latest changes from upstream, merges them into the
-# local master branch, and pushes those changes to the master branch in origin.
+# This script fetches the latest changes from upstream, and pushes those
+# changes to the master branch in origin (e.g., your GitHub fork of WebKit).
#
# Running this script periodically will keep your fork of WebKit on GitHub in
# sync with the "root" WebKit repository in upstream, assuming you've run
@@ -42,5 +42,5 @@
exit(1)
run(["git", "fetch", "upstream"], "Have you run configure-github-as-upstream to configure an upstream repository?")
-run(["git", "merge", "upstream/master", "master"], "Have you made changes to your master branch?")
-run(["git", "push", "origin", "master"])
+run(["git", "push", "origin", "upstream/master:master"])
+print "\nConsider running 'git merge origin' to update your local branches."
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
