Improve upstream branch CL diff detection |
|||
Issue descriptionSometimes, I will create a branch from a preexisting patch using "git cl patch", and then use "git-new-branch --upstream-current" to create a new branch for a dependent CL. However, when I try to upload the dependent branch, I will get an error telling me that I first need to upload the parent branch. Could we make the algorithm a little smarter here and actually compare the diffs to see if a new upload is necessary?
,
Oct 24 2017
Cool, thanks for the tip, Sergey!
,
Oct 24 2017
That's not exactly what I was looking for though; I really want something more like 'git cl upload --ancestors' that brings all the parent branches up to date so I could upload the descendent branch.
,
Oct 24 2017
Agreed. I think it's a good feature request for Infra>SDK. Thanks for filing!
,
Nov 3 2017
You don't actually want "git cl upload --ancestors" in this case, since the ancestor is a copy of someone else's change created with "git cl patch", and you probably don't want to upload a duplicate of their change. What you really want is to upload your change on top of the real change uploaded by someone else. For that, create the change from the preexisting patch using "git cl patch --force". Then the upload of the dependent change will work just fine. |
|||
►
Sign in to add a comment |
|||
Comment 1 by sergeybe...@chromium.org
, Oct 24 2017