简体   繁体   English

HG更改的文件在更新至修订版后未显示

[英]HG changed files not showing after update to revision

Using Mercurial, TortoiseHG, Win XP. 使用Mercurial,TortoiseHG,Win XP。

I had a working directory with a number of files. 我的工作目录中包含许多文件。 Committed and ready. 承诺并准备就绪。

My syncing software [incorrectly configured] copied some very old files [from before I was using HG] into my working directory, overwriting many many hours of work. 我的同步软件(配置不正确)将一些非常旧的文件(从使用HG之前的文件复制到了我的工作目录中),覆盖了许多小时的工作。

I wanted to go back to the last committed version, so I did "update to revision" -> current branch tip. 我想回到上一个提交的版本,所以我做了“更新到修订”->当前分支技巧。

That must have been the wrong thing, as now it shows all of those old files as being the current files, and no sign anywhere of all my work. 那肯定是错误的事情,因为现在它将所有这些旧文件显示为当前文件,而我所有工作的任何地方都没有迹象。

That "update to revision" doesn't show in the history or anywhere. 该“更新至修订版”不会显示在历史记录中或任何地方。

Anything I can do to get my files back? 我可以做些什么来取回文件?

Also, anytime I try to sync with bitbucket, it hangs, blocks the internet [browser and IM cease to work], and doesn't update [hence I do not have any other copy]. 另外,无论何时我尝试与bitbucket同步,它都会挂起,阻止互联网[浏览器和IM停止工作],并且不会更新[因此我没有任何其他副本]。 Anyone with an idea how to fix? 有人知道如何解决?

Thanks (desperate!) 谢谢(拼命!)

Below is the graph, as requested. 下面是根据要求的图形。 It doesn't show me anything about the update to tip (?): 它没有显示有关提示(?)更新的任何信息: 替代文字
(source: jewishmusic.net ) (来源: jewishmusic.net

If all your changes were committed all you have to do is: 如果所有更改都已提交,那么您要做的就是:
1. revert local changes (hg revert -a) 1.恢复本地更改(hg revert -a)
2. update to the revision you want (eg, hg update tip) 2.更新到您想要的修订版(例如,hg更新提示)

If you don't revert local changes HG will try to keep them when updating the working directory. 如果不还原本地更改,HG将在更新工作目录时尝试保留它们。

I don't have any solution to your second problem. 对于您的第二个问题,我没有任何解决方案。 I used TortoiseHG on WinXP and it worked well. 我在WinXP上使用过TortoiseHG,效果很好。 Try to upgrade to a newer version 尝试升级到新版本

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM