依賴提交

Create a dependency

If you are about to create a patch that depends on another (unmerged) patch, or if you already submitted a patch but need to fix the dependency (i.e. currently it is based on master and would break if merged without the dependency, or maybe you squashed your change on top of the dependency). Then this is the section you're looking for. If you want to fix the patch to have the right dependency rather than to create a new patch with a dependency, then make sure your working copy is clean (no uncommitted changes).

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")

Now we need to make sure the patch has the correct git-parent. Depending on whether you are creating a new patch or fixing an existing patch, there is two different ways to do this. If you are starting fresh:

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 patchgit 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 # or git review

If you need to amend your patch to have the correct dependency:

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 rebase --continuegit 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 # or git review

If you wish to set a topic, use:

git push gerrit HEAD:refs/for/master/myawesometopic # Append your topic name

or

git review -t myawesometopic

null

轉(zhuǎn)載于:https://www.cnblogs.com/mnzlichunyu/p/6164157.html

總結(jié)

以上是生活随笔為你收集整理的[openstack]依赖提交的全部?jī)?nèi)容，希望文章能夠幫你解決所遇到的問(wèn)題。

如果覺(jué)得生活随笔網(wǎng)站內(nèi)容還不錯(cuò)，歡迎將生活随笔推薦給好友。