git cl upload after resolving merge conflicts asks to upload the base branches |
|||||||
Issue descriptionI have a branch A based off master and branch B based off A. I uploaded both cls sometime ago and now the CL on branch B fails the dry run with "patch failed" (branch A succeeds). I checkout master and then branch A, rebase it and then checkout branch B and rebase it. I try to "git cl upload" from branch B and it shows me the following message: "Upload upstream branch A first. It is likely that this branch has been rebased since its last upload, so you just need to upload it again." This hasn't been the case with Rietveld. I imagine having more branches between master and B would require me to upload all the upstream branches before uploading the one requiring merge conflicts resolved. Can this be improved?
,
May 31 2017
,
Jun 2 2017
Yep, we can improve this. We already have "git cl upload --dependencies" which, if run while on branch A, would upload both branch A and B. It just doesn't work when run on branch B.
,
Jul 5 2017
Unfortunately I'm going to have to postpone this until I can rip a bunch of code out of git-cl. The --dependencies codepath is horrendous and not reusable, and branches from the main codepath immediately (due to the presence of the flag) rather than the much later point at which this code will have to branch (due to detecting the parent hasn't been uploaded). I really want to do this, but it's just not feasible with the current mess that is git-cl-upload.
,
Jul 26 2017
+1 to fixing this. It would be ideal if we could avoid re-uploading a new patch for the base branch like Reitveld. Think this adds a lot of redundant patches, especially since Gerrit does not support deleting patches.
,
Jan 3 2018
Removing Milestone-Afterglow, as it has ceased to have meaning. More refined milestones may be added back in the near future.
,
Jan 4 2018
Removing myself from all Pri-2/3 Gerrit issues and setting them to Available, to more accurately reflect the fact that there are a bunch of Pri-1 bugs open, and I'm splitting my time between codereview and codesearch.
,
Mar 2 2018
This broke an important workflow after migration to Gerrit. Would be nice if this can be tracked with a greater priority. |
|||||||
►
Sign in to add a comment |
|||||||
Comment 1 by jparent@chromium.org
, May 31 2017