我有两个补丁gerrit，我想让未合并的补丁依赖于合并的补丁。
两者都已上传到gerrit。
我该怎么做？有可能吗？
我可以通过gerrit来做吗？不是通过git和cherry pick。
问问题
3329 次
2 回答
4
Gerrit 中的依赖关系只是 Git 树图的一种表示。因此，要使变更 B 依赖于变更 A，B 必须以 A 作为其父项。
在您的情况下，您在两个不同的存储库中有两个更改。Gerrit 目前不支持跨存储库依赖项。然而，这是一个普遍要求的功能，并且刚刚在上周末的 Gerrit 用户大会上进行了讨论。希望在 Gerrit 的未来版本中添加对跨存储库依赖项的支持。
于 2012-11-20T04:33:17.660 回答
2
使用从这里获取的 git 命令：
git fetch --all # Make sure we have latest info from the repository
git review -d 1234 # Gerrit change number of the change you want as dependency ("parent")
git checkout -b bug/1234 # Creates a new branch, with the current branch (the dependency) as parent
# Edit files: make your changes
git add someFile.php some/other/file.js
git commit # Commit your patch
git log -n5 --decorate --pretty=oneline # Verify that the last 5 entries of the log now start with:
# * (HEAD, bug/1234) your change
# * (review/john/700) the dependency
# * (gerrit/master)
git push gerrit HEAD:refs/for/master # Use this instead of `git review`
git branch # Take note of the review/* branch that was created for this, it has an "*" in front of it
git checkout bug/1234 # Check out the local topic branch of your change
git rebase review/john/7000 # The branch name of the gerrit change we checked out earlier
# Resolve conflicts if needed,
# - use "git status" to see the files that need resolution
# - after fixing it in your editor, "git add filename" for each of the fixed files
git commit --amend -c HEAD # Re-commit your patch replacing the one with the wrong parent
git log -n5 --decorate --pretty=oneline # Verify that the last 5 entries of the log now start with:
# * (HEAD, bug/1234) your change
# * (review/john/700) the dependency
# * (gerrit/master)
git push gerrit HEAD:refs/for/master # Use this instead of `git review`
于 2012-11-23T10:34:43.447 回答