blocks|key|2131640|text|在TortoiseHg中，在使用提交对话框之前，必须将工作副本更新到要关闭的分支的尖端。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2131641|关闭分支将在分支提示顶部创建一个新的更改集。|2131642|您所描述的错误(abort:+can+only+close+branch+heads)通常发生在您已更新到更改集而不是在指定分支的顶端。|offset|length|style|CODE|2131643|entityMap^0|0|0|8|Y|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|N|8|@$F|O|G|P|H|I]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|K|$]]

In TortoiseHg, your working copy must be updated to the tip of the branch you want to close before using the commit dialog.

Closing a branch will create a new changeset on top of the branch tip.

The error you described (<code>abort: can only close branch heads</code>) typically occurs if you have updated to a changeset not at the tip of a named branch.

blocks|key|2490909|text|要合并，您需要一个干净的工作副本-没有未提交的更改。合并将放置在工作副本中供审阅，然后将工作副本提交给“完成”合并。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2490910|如果您没有准备提交未提交的更改，您可以看到暂时搁置这些更改(如果您有适当的扩展)或签出用于合并的新的工作副本。|2490911|使用存储库资源管理器：|2490912|将工作副本Update为rev+B。|ordered-list-item|offset|length|style|CODE|2490913|在修订历史记录中选择rev+D行。|2490914|右键单击rev+D并选择Merge+with....对话框应该显示rev+B应该是本地rev，D应该是其他rev。|2490915|在合并对话框中单击Merge并解决任何冲突(如果有)。|2490916|到目前为止，存储库中没有任何更改--您的合并在工作副本中。因此，如果有什么问题，您可以取消合并，恢复您的工作目录，并在稍后时间重新开始，或者在进行其他一些附加的分支或主干更改之后。|2490917|如果步骤1-4之后一切都很好，请在合并对话框中单击Commit提交合并。|2490918|entityMap^0|0|0|0|5|6|G|1|0|E|1|0|8|1|C|D|11|1|1B|1|0|9|5|0|0|P|6|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|10|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|11|8|@$I|12|J|13|K|L]|$I|14|J|15|K|L]]|9|@]|A|$]]|$1|M|3|N|5|H|7|16|8|@$I|17|J|18|K|L]]|9|@]|A|$]]|$1|O|3|P|5|H|7|19|8|@$I|1A|J|1B|K|L]|$I|1C|J|1D|K|L]|$I|1E|J|1F|K|L]|$I|1G|J|1H|K|L]]|9|@]|A|$]]|$1|Q|3|R|5|H|7|1I|8|@$I|1J|J|1K|K|L]]|9|@]|A|$]]|$1|S|3|T|5|6|7|1L|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|1M|8|@$I|1N|J|1O|K|L]]|9|@]|A|$]]|$1|W|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]]|X|$]]

To merge, you need a clean working copy - no uncommitted changes. The merge will be placed in the working copy for review and then you commit the working copy to "complete" the merge.

If you have uncommitted changes you are not prepared to commit, you can see about shelving those changes temporarily (if you have that appropriate extension) or checkout a new working copy somewhere else to use for the merge.

Using the Repository Explorer:

<ol>
<li><code>Update</code> the working copy to rev <code>B</code>.</li>
<li>Select rev <code>D</code> row in the revision history.</li>
<li>Right-click on rev <code>D</code> and choose <code>Merge with...</code>. The dialog should show rev <code>B</code> should be the local rev and <code>D</code> should be the other rev.</li>
<li>Click <code>Merge</code> in the merge dialog and resolve any conflicts, if any.</li>
</ol>

Up to now, nothing has been changed in the repository - your merge is in the working copy. So if something is wrong, you can cancel the merge, revert your working directory, and start over at later time or after making some other additional branch or trunk changes.

If everything is good after steps 1-4, click <code>Commit</code> in the merge dialog to commit the merge.

blocks|key|934668|text|--您给出的示例更多地是一个合并，而不是一个真正接近的。而且，如果就这么简单，您可能不需要/不需要创建一个命名的分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|934669|但是如果你真的想通过关闭分支机构，比如|934670|您创建了NewFeature分支|ordered-list-item|934671|然后修改默认分支和NewFeature分支。|934672|然后，如果NewFeature分支需要相当长的时间，您可能也已经将几次默认合并为NewFeature+(当您想最终将NewFeature分支合并为默认分支时，为了避免有太多的差异)|934673|最终，您的新特性完全实现或足够稳定，您将NewFeature分支合并到默认的分支中。|934674|从现在开始，没有人应该在NewFeature分支上提交任何东西，所以您希望关闭它。|934675|您可以在TortoiseHg中这样做(我有2.3.2版)：|934676|单击Hg提交.，当您是NewFeature分支上的时(不需要提交任何东西--或者使用您的最终合并)|934677|单击“分支:+NewFeature"+(以粗体显示在顶部)|934678|选择“关闭当前分支”。|934679|entityMap^0|0|R|0|A|2|0|0|0|0|0|0|0|0|7|P|O|0|0|T|0|0|B|0^^$0|@$1|2|3|4|5|6|7|12|8|@$9|13|A|14|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|15|8|@$9|16|A|17|B|C]]|D|@]|E|$]]|$1|H|3|I|5|J|7|18|8|@]|D|@]|E|$]]|$1|K|3|L|5|J|7|19|8|@]|D|@]|E|$]]|$1|M|3|N|5|J|7|1A|8|@]|D|@]|E|$]]|$1|O|3|P|5|J|7|1B|8|@]|D|@]|E|$]]|$1|Q|3|R|5|6|7|1C|8|@]|D|@]|E|$]]|$1|S|3|T|5|6|7|1D|8|@]|D|@]|E|$]]|$1|U|3|V|5|J|7|1E|8|@$9|1F|A|1G|B|C]|$9|1H|A|1I|B|C]]|D|@]|E|$]]|$1|W|3|X|5|J|7|1J|8|@$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|Y|3|Z|5|J|7|1M|8|@$9|1N|A|1O|B|C]]|D|@]|E|$]]|$1|10|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]]|11|$]]

The example you give is more a Merge than really a Close. Also, if it's that simple, you probably don't want/need to create a named branch.

But if you really want to close a branch through TortoiseHg, eg 

<ol>
<li>you created the NewFeature branch</li>
<li>then both the Default branch and NewFeature branches were modified</li>
<li>then if the NewFeature branch takes quite some time you might have also already merged several time Default into NewFeature (to avoid having too many differences when you'll want to finally merge the NewFeature branch into the Default one)</li>
<li>eventually your new feature is entirely implemented or stable enough, you merged the NewFeature branch into the Default one</li>
</ol>

From now on, no one is supposed to commit anything on the NewFeature branch, so you'd like to close it.

You can do so in TortoiseHg (I have version 2.3.2):

<ol>
<li>click Hg Commit... when you are on your NewFeature branch (no need to have anything to commit - or you do it with your final merge)</li>
<li>click "Branch: NewFeature" (it's at the top in bold)</li>
<li>select "Close current branch".</li>
</ol>

blocks|key|934693|text|您似乎还得到了此错误，即分支已经关闭，即试图关闭关闭的分支。一个更有用的错误消息将是有用的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|934694|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

You also seem to get this error is the branch is already closed, i.e. trying to close a closed branch. A more helpful error message would be useful.

blocks|key|2132005|text|对于那些对这个问题的答案感到困惑的人，下面是关于如何在TortoiseHg工作台中这样做的说明：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2132006|如何将特征分支和关闭分支合并|2132007|打开TortoiseHg工作台。|ordered-list-item|2132008|从Repository中选择您的存储库。|2132009|切换到您希望将分支合并到的分支(本例中为默认值)：|2132010|​|2132011|📷|atomic|offset|length|2132012|2132013|右键单击要合并和关闭的分支(本例中为NewFeature)，并选择Merge+with+Local。这将合并从NewFeature分支到default的分支更改。|style|BOLD|CODE|2132014|2132015|2132016|2132017|您将看到一个确认框，确认您的更改将从一个分支合并到另一个分支，单击步骤Next，立即提交并完成。|2132018|2132019|2132020|2132021|现在您可以从图中看到更改已经合并到其中，我们现在可以关闭NewFeature分支，因为我们不再需要它：|2132022|2132023|2132024|2132025|将本地更新到要关闭的分支，在本例中是NewFeature|2132026|2132027|2132028|2132029|单击提交，这是工作台顶部的绿色大勾号。|2132030|2132031|2132032|在提交窗口中，您应该看到要在“注释”文本框上方关闭的分支。单击分支名称：|2132033|2132034|2132035|2132036|弹出一个窗口并选择关闭当前分支。|2132037|2132038|2132039|2132040|现在单击提交。您的图表应该显示分支已经关闭：|2132041|2132042|2132043|2132044|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/0cc5897557d99441e2dd15e5bcac3a8e.png|imageAlt|1|https://developer.qcloudimg.com/http-save/yehe-900000/cef5733527cd28d6bfce532ac4f876e1.png|2|https://developer.qcloudimg.com/http-save/yehe-900000/f3b075393a95a22fca836142b4a7129f.png|3|https://developer.qcloudimg.com/http-save/yehe-900000/8b87cda66caffcd13fba0c71c5480e23.png|4|https://developer.qcloudimg.com/http-save/yehe-900000/54b8a5d8a83670716422e02b82f58c7b.png|5|https://developer.qcloudimg.com/http-save/yehe-900000/d37aca81c576aa9a0209ffdaeae362eb.png|6|https://developer.qcloudimg.com/http-save/yehe-900000/1ea9c3949eba3d2f9435567a15d6d946.png|7|https://developer.qcloudimg.com/http-save/yehe-900000/3ce02be0e10ab612606e293fe9bae079.png|8|https://developer.qcloudimg.com/http-save/yehe-900000/aef596683c659b48db9031e629cbae85.png^0|0|0|0|0|0|0|0|1|0|0|0|X|G|1J|A|1W|7|0|0|0|1|1|0|0|Z|C|0|0|0|1|2|0|0|S|A|0|0|0|1|3|0|0|I|A|0|0|0|1|4|0|0|2|2|0|0|1|5|0|0|0|0|0|1|6|0|0|9|6|0|0|0|1|7|0|0|0|0|0|1|8|0|0^^$0|@$1|2|3|4|5|6|7|2N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|2O|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|2P|8|@]|9|@]|A|$]]|$1|G|3|H|5|F|7|2Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|F|7|2R|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|2S|8|@]|9|@]|A|$]]|$1|M|3|N|5|O|7|2T|8|@]|9|@$P|2U|Q|2V|1|2W]]|A|$]]|$1|R|3|L|5|6|7|2X|8|@]|9|@]|A|$]]|$1|S|3|T|5|F|7|2Y|8|@$P|2Z|Q|30|U|V]|$P|31|Q|32|U|W]|$P|33|Q|34|U|W]]|9|@]|A|$]]|$1|X|3|L|5|6|7|35|8|@]|9|@]|A|$]]|$1|Y|3|N|5|O|7|36|8|@]|9|@$P|37|Q|38|1|39]]|A|$]]|$1|Z|3|L|5|6|7|3A|8|@]|9|@]|A|$]]|$1|10|3|11|5|F|7|3B|8|@$P|3C|Q|3D|U|V]]|9|@]|A|$]]|$1|12|3|L|5|6|7|3E|8|@]|9|@]|A|$]]|$1|13|3|N|5|O|7|3F|8|@]|9|@$P|3G|Q|3H|1|3I]]|A|$]]|$1|14|3|L|5|6|7|3J|8|@]|9|@]|A|$]]|$1|15|3|16|5|F|7|3K|8|@$P|3L|Q|3M|U|W]]|9|@]|A|$]]|$1|17|3|L|5|6|7|3N|8|@]|9|@]|A|$]]|$1|18|3|N|5|O|7|3O|8|@]|9|@$P|3P|Q|3Q|1|3R]]|A|$]]|$1|19|3|L|5|6|7|3S|8|@]|9|@]|A|$]]|$1|1A|3|1B|5|F|7|3T|8|@$P|3U|Q|3V|U|W]]|9|@]|A|$]]|$1|1C|3|L|5|6|7|3W|8|@]|9|@]|A|$]]|$1|1D|3|N|5|O|7|3X|8|@]|9|@$P|3Y|Q|3Z|1|40]]|A|$]]|$1|1E|3|L|5|6|7|41|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|F|7|42|8|@$P|43|Q|44|U|V]]|9|@]|A|$]]|$1|1H|3|N|5|O|7|45|8|@]|9|@$P|46|Q|47|1|48]]|A|$]]|$1|1I|3|L|5|6|7|49|8|@]|9|@]|A|$]]|$1|1J|3|1K|5|F|7|4A|8|@]|9|@]|A|$]]|$1|1L|3|L|5|6|7|4B|8|@]|9|@]|A|$]]|$1|1M|3|N|5|O|7|4C|8|@]|9|@$P|4D|Q|4E|1|4F]]|A|$]]|$1|1N|3|L|5|6|7|4G|8|@]|9|@]|A|$]]|$1|1O|3|1P|5|F|7|4H|8|@$P|4I|Q|4J|U|V]]|9|@]|A|$]]|$1|1Q|3|L|5|6|7|4K|8|@]|9|@]|A|$]]|$1|1R|3|N|5|O|7|4L|8|@]|9|@$P|4M|Q|4N|1|4O]]|A|$]]|$1|1S|3|L|5|6|7|4P|8|@]|9|@]|A|$]]|$1|1T|3|1U|5|F|7|4Q|8|@]|9|@]|A|$]]|$1|1V|3|L|5|6|7|4R|8|@]|9|@]|A|$]]|$1|1W|3|N|5|O|7|4S|8|@]|9|@$P|4T|Q|4U|1|4V]]|A|$]]|$1|1X|3|L|5|6|7|4W|8|@]|9|@]|A|$]]|$1|1Y|3|-4|5|6|7|4X|8|@]|9|@]|A|$]]]|1Z|$20|$5|21|22|23|A|$24|25|26|-4]]|27|$5|21|22|23|A|$24|28|26|-4]]|29|$5|21|22|23|A|$24|2A|26|-4]]|2B|$5|21|22|23|A|$24|2C|26|-4]]|2D|$5|21|22|23|A|$24|2E|26|-4]]|2F|$5|21|22|23|A|$24|2G|26|-4]]|2H|$5|21|22|23|A|$24|2I|26|-4]]|2J|$5|21|22|23|A|$24|2K|26|-4]]|2L|$5|21|22|23|A|$24|2M|26|-4]]]]

For anyone that's confused by the answers to this question, here are the instructions on how to do this from within the TortoiseHg Workbench:

<h2>How to Merge Feature Branch and Close Branch</h2>

<ol>
<li>Open TortoiseHg Workbench.</li>
<li>Select your repository from the Registry Repository.</li>
<li>Switch to the branch that you would like merge your branch into (default in this example):</li>
</ol>

<a href="https://i.stack.imgur.com/C9Clj.png" rel="noreferrer"><img src="https://i.stack.imgur.com/C9Clj.png" alt="Switch to the default branch"></a>

<ol start="4">
<li>Right mouse click the branch that you'd like to merge and close (NewFeature in this example) and choose Merge with Local. This will merge the branch changes from the <code>NewFeature</code> branch into <code>default</code>:</li>
</ol>

<a href="https://i.stack.imgur.com/EpzRg.png" rel="noreferrer"><img src="https://i.stack.imgur.com/EpzRg.png" alt="Merge one branch into another"></a>

<ol start="5">
<li>You will see a confirmation box that confirms that your changes will be merged from one branch to another, click through the steps Next, Commit Now and Finish:</li>
</ol>

<a href="https://i.stack.imgur.com/VHIhN.png" rel="noreferrer"><img src="https://i.stack.imgur.com/VHIhN.png" alt="Confirmation box"></a>

<ol start="6">
<li>Now you can see from the Graph that the changes have been merged in, we can now close the <code>NewFeature</code> branch as we no longer need it:</li>
</ol>

<a href="https://i.stack.imgur.com/Us2av.png" rel="noreferrer"><img src="https://i.stack.imgur.com/Us2av.png" alt="Branch merge graph"></a>

<ol start="7">
<li>Update your local to the branch you would like to close, in this case it is <code>NewFeature</code>:</li>
</ol>

<a href="https://i.stack.imgur.com/n6iDm.png" rel="noreferrer"><img src="https://i.stack.imgur.com/n6iDm.png" alt="Update to branch to close"></a>

<ol start="8">
<li>Click commit, the big green tick at the top of the workbench.
<a href="https://i.stack.imgur.com/ScfxY.png" rel="noreferrer"><img src="https://i.stack.imgur.com/ScfxY.png" alt="Big green tick"></a></li>
<li>In the commit window, you should see the branch that you want to close above the comment text box. Click the branch name:</li>
</ol>

<a href="https://i.stack.imgur.com/QIsha.png" rel="noreferrer"><img src="https://i.stack.imgur.com/QIsha.png" alt="Commit window with branch name we want to close"></a>

<ol start="10">
<li>A window will pop up and select close current branch:</li>
</ol>

<a href="https://i.stack.imgur.com/U2I58.png" rel="noreferrer"><img src="https://i.stack.imgur.com/U2I58.png" alt="Close current branch"></a>

<ol start="11">
<li>Now click commit. Your graph should show that the branch is closed:</li>
</ol>

<a href="https://i.stack.imgur.com/kMMZG.png" rel="noreferrer"><img src="https://i.stack.imgur.com/kMMZG.png" alt="Graph showing closed branch"></a>

I have a named branch, NewFeature, that I made off of the default branch. I've made a couple commits to that branch, and now I'd like to merge it to rejoin the default branch.

Now (each letter is a commit):

<pre><code> default: A---B
NewFeature: \--C---D
</code></pre>

What I'd like:

<pre><code> default: A---B-----------E
NewFeature: \--C---D--/
</code></pre>

I tried right clicking the directory and selecting "Hg Commit...". I then selected "Close Current Named Branch". I got this error: <code>abort: can only close branch heads</code>

I also looked for a "close branch" option in the repository explorer, but I couldn't find anything.

Could someone please help?
Thanks in advance!

Edit: I posted an <a href="https://bitbucket.org/tortoisehg/hgtk/issues/1735/close-and-merge-branch" rel="nofollow noreferrer">issue</a> to TortoiseHg

Mercurial via TortoiseHg - Merge a named branch then close it

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我有一个名为NewFeature的分支，它是我从默认分支中提取的。我对这个分支进行了几次提交，现在我想合并它以重新加入默认的分支。现在(每个字母都是一个提交)：   default: A---BNewFeature:      \--C---D我想要的：   default: A---B-----------ENewF...

问通过TortoiseHg合并一个指定的分支，然后关闭它
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问通过TortoiseHg合并一个指定的分支，然后关闭它EN