[PATCH] D47760: utils/release: Add merge-git.sh
Hans Wennborg via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 6 23:39:12 PDT 2018
hans accepted this revision.
hans added a comment.
This revision is now accepted and ready to land.
lgtm, just some comments on the comments
================
Comment at: utils/release/merge-git.sh:11
+#
+# This patch will merge an svn revision to a git repo using git-svn while
+# preserving the svn commit message.
----------------
s/patch/script/ ?
================
Comment at: utils/release/merge-git.sh:15
+# In order to use this script, you must:
+# 1) checkout the stable branch you would like to merge the revision into.
+# 2) Correctly configure the branch as an svn-remote by adding the following to
----------------
The checkout must be in one of the per-project git repositories, or does this also work in the monorepo?
================
Comment at: utils/release/merge-git.sh:18
+# your .git/config file for your git repo (replace xy with the major/minor
+# version of the release branch. e.g. release_50 or release_60):
+#
----------------
and 3) git-svn dcommit?
Repository:
rL LLVM
https://reviews.llvm.org/D47760
More information about the llvm-commits
mailing list