当我尝试 hg rebase -s 1775 --collapse 时，系统会要求我合并自 rev 1774 以来接触过的所有文件。如何避免这种情况？
详细信息
我刚刚学习如何变基。我成功地尝试了此处给出的示例，以及一些细微的变化。然而，在我自己的存储库中，当我尝试相同的步骤时，系统会要求我在变基时合并大量文件。这就是我所做的。我做错了什么？
hg update -r 1774
hg tag "Started-New-Feature"
hg rebase -s 1775 --collapse
我想可能是因为我更新到了-r1774，所以我在标记-r1774后更新到tip。相同的结果。
hg update -r 1774
hg tag "Started-New-Feature"
hg update
hg rebase -s 1775 --collapse
hg 标签 创建一个新的 rev -r1784。所以我尝试专门更新到-r1783。相同的结果。
hg update -r 1774
hg tag "Started-New-Feature"
hg update -r 1774
hg update -r 1783
hg rebase -s 1775 --collapse
我在网上搜索了相关问题，但没有找到任何内容，这并不意味着答案不存在。欢迎指出现有答案。
编辑：
这似乎与已修复的报告的 Mercurial 错误有关在1.4中。我有1.1版本。我尝试更新到 1.4 或更高版本，但 sudo apt-get install Mercurial 说我有最新版本，并且下载链接 目前已损坏。所以也许答案就是获取最新版本，但希望有另一种方法可以解决这个问题。
When I try to hg rebase -s 1775 --collapse, I am asked to merge all the files I touched since rev 1774. How can I avoid that?
Details
I am just learning how to rebase. I successfully tried the example given here, and a few minor variations. However, in my own repository, when I try the same steps, I am asked to merge a boat-load of files when I rebase. Here's what I do. What am I doing wrong?
hg update -r 1774
hg tag "Started-New-Feature"
hg rebase -s 1775 --collapse
I thought maybe it was because I had updated to -r1774, so I updated to tip after tagging -r1774. Same result.
hg update -r 1774
hg tag "Started-New-Feature"
hg update
hg rebase -s 1775 --collapse
The hg tag creates a new rev -r1784. So I tried updating specifically to -r1783. Same result.
hg update -r 1774
hg tag "Started-New-Feature"
hg update -r 1774
hg update -r 1783
hg rebase -s 1775 --collapse
I've searched the web and SO for related questions and didn't find anything, which doesn't mean answers don't exist. Pointers to existing answers are welcome.
Edit:
This seems related to a reported mercurial bug that was fixed in 1.4. I have version 1.1. I tried updating to 1.4 or later, but sudo apt-get install mercurial says I have the latest, and the download link on the mercurial page is currently broken. So maybe the answer is just getting the latest version, but hopefully there's another way around this.
发布评论
评论（1）
你用的是ubuntu吗？如果是这样，您可以使用 hg 的 launchpad ppa 版本，该版本往往非常最新 https: //launchpad.net/~mercurial-ppa/+archive/releases
Are you using ubuntu? If so you can use the launchpad ppa version of hg, which tends to be very currenty https://launchpad.net/~mercurial-ppa/+archive/releases