如何在Gerrit中创建合并补丁和先前合并补丁之间的依赖关系？

Question

如何在Gerrit中创建合并补丁和先前合并补丁之间的依赖关系？

linuxgitdependenciespatchgerrit

3

我在上有两个补丁，我想让尚未合并的依赖于已合并的补丁。

两个补丁都已上传到。

我该如何操作？这是否可能？
我能否通过而不是通过git和cherry pick完成？

假设https://gerrit.wikimedia.org/r/#/c/34106/是尚未合并的文件。

合并的文件为https://gerrit.wikimedia.org/r/#/c/25756/

- 0x90

2个回答

3

使用从这里获取的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`

- 0x90

网页内容由stack overflow 提供, 点击上面的

可以查看英文原文，
原文链接

- Brad · Accepted Answer

Gerrit中的依赖关系只是Git树图的一种表示方式。因此，要使B变更依赖于A变更，则B必须将A作为其父变更。

在您的情况下，您有两个不同存储库中的两个变更。目前，Gerrit不支持跨存储库的依赖关系。这是一个常见的请求功能，上周末在Gerrit用户会议上刚刚讨论。希望在未来的Gerrit版本中增加对跨存储库依赖关系的支持。