Darcs 修改记录工作流程

发布于 2024-07-09 20:13:44 字数 285 浏览 11 评论 0原文

对我来说,记录补丁,将其拉入我的暂存分支,然后意识到我做了一些小而愚蠢的事情,例如日志消息中的拼写错误,或者类似的琐碎的事情(在我看来)不需要(在我看来),这并不罕见。全新补丁。

在这些情况下,我一直在使用:

darcs amend-record

更新补丁。 但是,当我重新拉取 darcs 时,会将补丁视为冲突,因此我最终不得不在暂存分支中取消记录并恢复补丁,然后再次拉取它。

是否有 darcs 命令或选项可以让我更简单地提取修改后的补丁?

It's not uncommon for me to record a patch, pull it into my staging branch and then realize I've done something small and silly like a typo in a logging message, or something similarly trivial which doesn't require (to my mind) a whole new patch.

In these instances, I've been using:

darcs amend-record

To update the patch. But when I re-pull darcs will treat the patches as conflicting, so I end up having to unrecord and revert the patch in the staging branch, and then pull it again.

Is there a darcs command or option that will allow me to more simply pull an amended patch?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(2

糖果控 2024-07-16 20:13:44

并不真地。 修改补丁会使其成为不同的补丁,即使名称与以前相同。 在补丁被推送/拉取到其他地方之前,amend-record 通常仅在本地存储库中使用。 如果补丁已推送到其他存储库,您需要在这些存储库中删除它,然后重新拉取修改后的版本。 (obliterate 是“unpull”的现代拼写)。

或者,使用回滚命令; 当相关存储库是公开的并由多个开发人员使用时,这会更友好。

Not really. Amending a patch makes it into a different patch, even though the name is the same as before. amend-record is normally used only in the local repo, before the patch has been pushed/pulled elsewhere. If the patch has been pushed to other repos, you'll need to obliterate it in those, and re-pull the amended version. (obliterate is the modern spelling of "unpull").

Alternately, use the rollback command; this is more friendly when the repos in question are public and used by multiple developers.

吲‖鸣 2024-07-16 20:13:44

您可以尝试首先在暂存分支上运行darcs unpull,然后拉入修改后的补丁。

You could try first running darcs unpull on the staging branch then pulling in the amended patch.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文