blocks|key|283463|text|hg+rollback就是你想要的。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|283464|在TortoiseHg中，提交是在hg+rollback对话框中完成的。打开commit对话框，选择"Undo“。|283465|​|283466|📷|atomic|283467|283468|entityMap|0|LINK|mutability|MUTABLE|url|http://www.selenic.com/mercurial/hg.1.html#rollback|1|IMAGE|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/99a4a8c08cca6690a8270d8a20cf51e2.png|imageAlt^0|0|B|0|B|0|0|H|B|0|0|0|1|1|0|0^^$0|@$1|2|3|4|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@$9|14|A|15|1|16]]|E|$]]|$1|F|3|G|5|6|7|17|8|@$9|18|A|19|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|1A|8|@]|D|@]|E|$]]|$1|J|3|K|5|L|7|1B|8|@]|D|@$9|1C|A|1D|1|1E]]|E|$]]|$1|M|3|I|5|6|7|1F|8|@]|D|@]|E|$]]|$1|N|3|-4|5|6|7|1G|8|@]|D|@]|E|$]]]|O|$P|$5|Q|R|S|E|$T|U]]|V|$5|W|R|X|E|$Y|Z|10|-4]]]]

<a href="http://www.selenic.com/mercurial/hg.1.html#rollback" rel="noreferrer"><code>hg rollback</code></a> is what you want.

In TortoiseHg, the <code>hg rollback</code> is accomplished in the commit dialog. Open the commit dialog and select "Undo".

<img src="https://i.stack.imgur.com/HeICB.png" alt="alt text">

blocks|key|283470|text|因为您不能回滚，所以您应该将提交合并到您在拉出时获得的新头中。如果你不想要你在其中做的任何工作，你可以很容易地使用this+tip来完成。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|283471|所以，如果你已经把更新到他们的头部，你可以这样做：|style|BOLD|283472|hg+--config+ui.merge=internal:local+merge|code-block|syntax|javascript|283473|保留当前签出修订中的所有更改，而不保留未签出修订中的任何更改(即您编写的不再需要的修订)。|283474|这是一个很好的方法，因为它可以保持你的历史记录的准确性和完整性。如果两年后有人在你下载的东西中发现了一个bug，你可以查看你的(未使用但保存的)实现，然后说，“哦，我做得对”。:)|283475|entityMap|0|LINK|mutability|MUTABLE|url|https://www.mercurial-scm.org/wiki/TipsAndTricks#Keep_.22My.22_or_.22Their.22_files_when_doing_a_merge^0|1L|8|0|0|9|8|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|6|7|12|8|@$A|13|B|14|F|G]]|9|@]|C|$]]|$1|H|3|I|5|J|7|15|8|@]|9|@]|C|$K|L]]|$1|M|3|N|5|6|7|16|8|@]|9|@]|C|$]]|$1|O|3|P|5|6|7|17|8|@]|9|@]|C|$]]|$1|Q|3|-4|5|6|7|18|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

Since you can't rollback you should merge that commit into the new head you got when you pulled. If you don't want any of the work you did in it you can easily do that using <a href="https://www.mercurial-scm.org/wiki/TipsAndTricks#Keep_.22My.22_or_.22Their.22_files_when_doing_a_merge" rel="nofollow noreferrer">this tip</a>.

So if you've pulled and updated to their head you can do this:

<pre><code>hg --config ui.merge=internal:local merge
</code></pre>

keeps all the changes in the currently checked out revision, and none of the changes in the not-checked-out revision (the one you wrote that you no longer want).

This is a great way to do it because it keeps your history accurate and complete. If 2 years from now someone finds a bug in what you pulled down you can look in your (unused but saved) implementation of the same thing and go, "oh, I did it right". :)

blocks|key|3209702|text|hg+strip将从存储库中完全删除修订版本(以及任何后代)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3209703|要使用strip，您需要通过将以下行添加到.hgrc+(或mercurial.ini)来安装MqExtension：|3209704|[extensions]
mq+=|code-block|syntax|javascript|3209705|在TortoiseHg中，工作台中提供了strip命令。右键单击修订版本，然后选择“修改历史记录”“->”“条带”。|3209706|由于strip更改了存储库的历史记录，因此您应该只在尚未与任何人共享的修订版本上使用它。如果您正在使用mercurial+2.1%2B，则可以使用phases来跟踪此信息。如果提交仍处于草案阶段，则尚未与其他存储库共享，因此您可以安全地剥离它。(感谢Zasurus指出这一点)。|3209707|entityMap|0|LINK|mutability|MUTABLE|url|https://www.mercurial-scm.org/wiki/StripExtension|1|https://www.mercurial-scm.org/wiki/MqExtension|2|https://www.mercurial-scm.org/wiki/Phases^0|0|8|0|8|0|0|1A|B|1|0|0|0|2|5|1Z|6|2|0^^$0|@$1|2|3|4|5|6|7|12|8|@$9|13|A|14|B|C]]|D|@$9|15|A|16|1|17]]|E|$]]|$1|F|3|G|5|6|7|18|8|@]|D|@$9|19|A|1A|1|1B]]|E|$]]|$1|H|3|I|5|J|7|1C|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|1D|8|@]|D|@]|E|$]]|$1|O|3|P|5|6|7|1E|8|@$9|1F|A|1G|B|C]]|D|@$9|1H|A|1I|1|1J]]|E|$]]|$1|Q|3|-4|5|6|7|1K|8|@]|D|@]|E|$]]]|R|$S|$5|T|U|V|E|$W|X]]|Y|$5|T|U|V|E|$W|Z]]|10|$5|T|U|V|E|$W|11]]]]

<a href="https://www.mercurial-scm.org/wiki/StripExtension" rel="noreferrer"><code>hg strip</code></a> will completely remove a revision (and any descendants) from the repository.

To use strip you'll need to install <a href="https://www.mercurial-scm.org/wiki/MqExtension" rel="noreferrer">MqExtension</a> by adding the following lines to your .hgrc (or mercurial.ini):

<pre><code>[extensions]
mq =
</code></pre>

In TortoiseHg the strip command is available in the workbench. Right click on a revision and choose 'Modify history' -> 'Strip'.

Since <code>strip</code> changes the the repository's history you should only use it on revisions which haven't been shared with anyone yet. If you are using mercurial 2.1+ you can uses <a href="https://www.mercurial-scm.org/wiki/Phases" rel="noreferrer">phases</a> to track this information. If a commit is still in the draft phase it hasn't been shared with other repositories so you can safely strip it. (Thanks to Zasurus for pointing this out).

blocks|key|3209728|text|在拉出并更新了工作区之后，执行thg并右键单击您想要删除的更改集，然后单击modify+history+->+strip，它将删除更改集，您将指向default+tip。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3209729|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|$]]

after you have pulled and updated your workspace do a thg and right click on the change set you want to get rid of and then click modify history -> strip, it will remove the change set and you will point to default tip.

blocks|key|284850|text|它的解决方法。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|284851|如果您不推送到服务器，您将克隆到新文件夹，否则将从存储库文件夹中清除(删除所有文件)，并克隆新的。|284852|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

Its workaround. 

If you not push to server, you will clone into new folder else washout(delete all files) from your repository folder and clone new.

blocks|key|283568|text|在当前版本的TortoiseHg工作台4.4.1+(07.2018)中，您可以使用Repository+-+Rollback/undo...|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|283569|📷|atomic|283570|​|283571|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/81a40e5a1768d70d2c48f85dd8af9ad3.png|imageAlt^0|15|A|1I|G|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|T|8|@$9|U|A|V|B|C]|$9|W|A|X|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@$9|Z|A|10|1|11]]|E|$]]|$1|I|3|J|5|6|7|12|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|13|8|@]|D|@]|E|$]]]|L|$M|$5|N|O|P|E|$Q|R|S|-4]]]]

In the current version of TortoiseHg Workbench 4.4.1 (07.2018) you can use <code>Repository</code> - <code>Rollback/undo...</code>: 
<a href="https://i.stack.imgur.com/C6gpa.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/C6gpa.png" alt="enter image description here"></a>

blocks|key|3209837|text|我认为现在更现代、更简单的方法是hg+uncommit。注意，这会留下一个空的提交，如果您想要稍后重用提交消息，这将非常有用。如果不这样做，请使用hg+uncommit+--no-keep来避免留下空的提交。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3209838|3209839|+hg取消提交选项...文件...|blockquote|3209840|3209841|取消提交部分或全部本地变更集|3209842|此命令撤消本地提交的效果，将受影响的文件返回到其未提交状态。这意味着在变更集中修改或删除的文件将保持不变，因此将在工作目录中保持修改。如果未指定文件，则commit将保留为空，除非--+no+-keep|3209843|3209844|对不起，我不确定什么是等同的TortoiseHg。|3209845|entityMap^0|G|B|21|L|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|T|8|@$9|U|A|V|B|C]|$9|W|A|X|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|Z|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|10|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|11|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|12|8|@]|D|@]|E|$]]|$1|O|3|-4|5|6|7|13|8|@]|D|@]|E|$]]|$1|P|3|Q|5|6|7|14|8|@]|D|@]|E|$]]|$1|R|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|S|$]]

I believe the more modern and simpler way to do this now is <code>hg uncommit</code>. Note this leaves behind an empty commit which can be useful if you want to reuse the commit message later. If you don't, use <code>hg uncommit --no-keep</code> to not leave the empty commit.
<blockquote>
hg uncommit [OPTION]... [FILE]...
uncommit part or all of a local changeset
<pre><code>This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain
modified in the working directory.

If no files are specified, the commit will be left empty, unless --no-keep
</code></pre>
</blockquote>
Sorry, I am not sure what the equivalent is TortoiseHg.

blocks|key|287297|text|我最近遇到了这个问题，尽管我的情况略有不同-我已经推送了我想要撤消的提交。我用hg+backout+<revision-code>解决了我的问题。它的工作方式似乎与git+revert类似。来自this+answer|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|287298|287299|+backout：创建与给定提交相反的新提交。Net效果是撤消，但更改将保留在您的历史记录中。|blockquote|287300|287301|287302|在TortiseHg中，这可以通过右键单击您想要撤消的提交并选择Backout...来完成。TortiseHg文档here。|287303|​|287304|📷|atomic|287305|287306|我认为有一个论点是创建一个新的撤销提交，而不是直接删除以前的提交。来自this+article关于git+revert|287307|287308|不是从项目历史记录中删除提交，而是找出如何反转由提交引入的更改，并使用生成的反向内容附加新的提交。这可以防止Git丢失历史记录，这对于您修订历史记录的完整性和可靠的协作非常重要。|287309|287310|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/5371159/what-is-the-difference-between-rollback-backout-and-strip-in-the-mercurial-eclihistory.|1|https://tortoisehg.readthedocs.io/en/latest/workbench.html#revision-context-menus|2|IMAGE|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/904c6b11f053cf086025a4f6724241b2.png|imageAlt|3|https://www.atlassian.com/git/tutorials/undoing-changes/git-revert^0|13|Q|2A|A|2P|B|0|0|0|1|7|0|0|0|W|A|1L|4|1|0|0|0|1|2|0|0|1D|A|Z|C|3|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1H|8|@$9|1I|A|1J|B|C]|$9|1K|A|1L|B|C]]|D|@$9|1M|A|1N|1|1O]]|E|$]]|$1|F|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|1Q|8|@$9|1R|A|1S|B|C]]|D|@]|E|$]]|$1|J|3|-4|5|6|7|1T|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|1U|8|@]|D|@]|E|$]]|$1|L|3|M|5|6|7|1V|8|@$9|1W|A|1X|B|C]]|D|@$9|1Y|A|1Z|1|20]]|E|$]]|$1|N|3|O|5|6|7|21|8|@]|D|@]|E|$]]|$1|P|3|Q|5|R|7|22|8|@]|D|@$9|23|A|24|1|25]]|E|$]]|$1|S|3|O|5|6|7|26|8|@]|D|@]|E|$]]|$1|T|3|U|5|6|7|27|8|@$9|28|A|29|B|C]]|D|@$9|2A|A|2B|1|2C]]|E|$]]|$1|V|3|-4|5|6|7|2D|8|@]|D|@]|E|$]]|$1|W|3|X|5|I|7|2E|8|@]|D|@]|E|$]]|$1|Y|3|-4|5|6|7|2F|8|@]|D|@]|E|$]]|$1|Z|3|-4|5|6|7|2G|8|@]|D|@]|E|$]]]|10|$11|$5|12|13|14|E|$15|16]]|17|$5|12|13|14|E|$15|18]]|19|$5|1A|13|1B|E|$1C|1D|1E|-4]]|1F|$5|12|13|14|E|$15|1G]]]]

I ran into this issue recently, although my situation was slightly different - I had already pushed the commit I wanted to undo. I solved my problem with <code>hg backout &lt;revision-code&gt;</code>. It seems to work in a similar way to <code>git revert</code>. From <a href="https://stackoverflow.com/questions/5371159/what-is-the-difference-between-rollback-backout-and-strip-in-the-mercurial-eclihistory.">this answer</a>:
<blockquote>
<code>backout</code>: create a new commit that is the inverse of a given commit.
Net effect is an undo, but the change remains in your history.
</blockquote>
In TortiseHg this can be done by right clicking the commit you wish to undo and selecting <code>Backout...</code>. TortiseHg doc <a href="https://tortoisehg.readthedocs.io/en/latest/workbench.html#revision-context-menus" rel="nofollow noreferrer">here</a>.
<a href="https://i.stack.imgur.com/On6x9.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/On6x9.png" alt="Hg Backout example image" /></a>
I think there's an argument for creating a new undo commit instead of removing the previous commit outright. From <a href="https://www.atlassian.com/git/tutorials/undoing-changes/git-revert" rel="nofollow noreferrer">this article</a> about <code>git revert</code>:
<blockquote>
Instead of removing the commit from the project history, it figures
out how to invert the changes introduced by the commit and appends a
new commit with the resulting inverse content. This prevents Git from
losing history, which is important for the integrity of your revision
history and for reliable collaboration.
</blockquote>

How can I undo my last accidentally commited (not pushed) change in Mercurial?

If possible, a way to do so with TortoiseHg would be prefered.

Update

In my concrete case I commited a changeset (not pushed). Then I pulled and updated from the server. With these new updates I decided, that my last commit is obsolete and I don't want to sync it. So it seems, that <code>hg rollback</code> is not exactly what I'm searching for, because it would rollback the pull instead of my commit.

Mercurial undo last commit

服务器

如何在Mercurial中撤消上次意外提交(而不是推送)的更改？如果可能的话，最好使用TortoiseHg来实现这一点。更新在我的具体案例中，我提交了一个变更集(而不是推送的)。然后我从服务器拉取并更新。有了这些新的更新，我决定我的最后一次提交是过时的，我不想同步它。所以看起来，hg rollback并不完全是我要搜索...

问Mercurial撤消上次提交
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Mercurial撤消上次提交EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Mercurial撤消上次提交
EN