python / python/cherry-picker

Problems with pushing into remote repository

未关闭
#121 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看

还没有人认领这个 Issue。

bug
主要语言
Python
星标
65
派生
47
平均合并
5 分钟
30 天内合并 PR
1

描述

Something gone wrong, so I decided to recreate the backport. But the second attempt failed. As well as all following. Here is the result of the last failure.:

$ cherry_picker --continue
🐍 🍒 ⛏
Failed to push to origin ☹
To github.com:serhiy-storchaka/cpython.git
 ! [rejected]              backport-8f60298-3.11 -> backport-8f60298-3.11 (stale info)
error: не вдалося надіслати деякі посилання в «github.com:serhiy-storchaka/cpython.git»

branch backport-8f60298-3.11 has been deleted.

Backport PR:
...

I tried to remove the branch in my GitHub clone, but it did not help until I pulled from it into my local clone.

It seems, that when something gone wrong, cherry_picker pushed the broken branch into my remote repository on GitHub and removed it from the local repository. In the following attempts it failed to push into the remote repository (either because it already existed, or because it was removed, but it did not know about this), but removed the branch from the local repository anyway.

I expect from it to use more forced method to push the branch into the remote repository (if it is already not used), and if the operation fails due to stale info, try to pull from the remote repository and repeat.

And of course it should not just remove the branch from the local repository. Instead it should keep it until you fix the error and continue with cherry_picker --continue, or give up and cancel it with cherry_picker --abort.

贡献指南

这个仓库没有索引到贡献指南

从这里开始

  1. 先读完整个 Issue,再读项目的贡献指南。
  2. 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
  3. Fork 仓库,在一个分支上完成修改。
  4. 提交 Pull Request,并在描述里引用这个 Issue 编号。

调研方向

首先运行报告中的 cherry_picker --continue 流程,并检查 backport 操作周围的分支推送和清理处理。完成的标准是:推送失败时保留本地分支,适当地重试过时的远程信息,并且 --continue--abort 仍然可用。

由索引模型根据 Issue 内容生成。

评估

技术栈
python
领域
cli
Issue 类型
缺陷
难度
4/5
预计耗时
3-5 天
活跃度
停滞
描述清晰度
基本清楚
新手友好度
38/100

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。