tortoisehg

What happens to original changesets after an Hg “history rewrite” (histedit, commit --amend), and how can they be recovered?

霸气de小男生 提交于 2019-12-06 15:29:18
In Git - with it's immutable changeset objects and mutable refs - I know that the original commits remain, which gives me a warm fuzzy feeling after an 'oops' "history rewriting" moment. For example, after a "history rewriting" git rebase the original changesets (cbe7698, 09c6268) are still there and a new changeset (08832c0) was added. I can easily restore/access the other changesets until such a time as they are pruned. $ git log --oneline --graph --decorate $(git rev-list -g --all) * 08832c0 (HEAD -> master) Added bar and quxx to foo.txt | * cbe7698 Added quxx to foo.txt | * 09c6268 Added

Why is this C# code not working? I am trying to read the output of a shell to TortoiseHG (Mercurial)

戏子无情 提交于 2019-12-06 10:51:05
I am trying to get mercurial to run in a shell from my C# wpf application. My purpose is to retrieve the output into a string so that I can parse it. Unfortunately for me, it seems that hg.exe (from tortoiseHg), does not return anything via the code below. Other .exe's appear to work, as seen in the comments below; My Code is below; ` string workingDir = ""; string filename = ""; string param = ""; //This works workingDir = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); filename = "unrar.exe"; param = ""; //this works workingDir = "c:\\program

TortoiseHg仓库注册表等信息位置,重装系统时可备份、恢复使用

南笙酒味 提交于 2019-12-06 08:06:49
背景 当有几十个仓库时,半年/1年要重新安装系统,就一直存在这个问题,每个仓库要重新注册,分散在很多的文件夹中,不好找。 版本信息 TortoiseHg4.5.3/4.0.1 @Windows 2016/2012 仓库注册表等信息位于,重装系统时可备份: C:\Users\Administrator\AppData\Roaming\TortoiseHg C:\Users\Administrator\AppData\Roaming\TortoiseHg>dir 驱动器 C 中的卷是 w2016@128gSSD 卷的序列号是 56B9-F633 C:\Users\Administrator\AppData\Roaming\TortoiseHg 的目录 2018/05/28 16:07 <DIR> . 2018/05/28 16:07 <DIR> .. 2018/05/28 15:28 2,802 OverlayServerLog.txt 2018/05/26 11:31 143 OverlayServerLog.txt.old 2018/05/28 16:07 6,718 thg-reporegistry.xml 2018/05/28 16:07 23,954 TortoiseHgQt.ini 4 个文件 33,617 字节 2 个目录 13,912,735,744 可用字节 方法

Mercurial, TortoiseHg, keyring and using two remote repos with two usernames and passwords being forgotten

泄露秘密 提交于 2019-12-06 07:29:11
I am using TortoiseHg Workbench 64bit 2.1.4, though it may be an issue with Mercurial. The OS is Windows 7 (64bit). I have two projects that I push to two different locations (one is bitbucket, the other is an private one). They use different usernames and passwords, and I push over HTTPS. I have setup the keyring in my mercurial.ini: [extensions] mercurial_keyring= and in the two .hg/hgrc files, I have setup paths with their respective values: [paths] default = https://userX@domainX/XXX If I only work on one repo, the password is remembered each time I connect. However, when I switch between

How to keep mercurial graph “flat”

谁说胖子不能爱 提交于 2019-12-06 02:30:05
I have a "main" repository, I clone it and make some changes in the clone. In the meantime, there are other changes in "main", so I pull them and merge them in my clone. I make more changes in the clone, and merge any other new changes from "main". This gives me this graph: When I finish my work in the clone, I push to the main repository and now the graph in "main" looks like this: I know they're topologically the same, but to me the first one is clearer (this one is a very simple case, but things could get more complicated). Is there any way to prevent this? I've found this question about

Mercurial and Notepad++ Integration

南楼画角 提交于 2019-12-05 20:28:39
问题 Are there plug-ins for Notepad++ to integrate with Mercurial and TortoiseHg? 回答1: Plugin exists only for tortoise svn, you can only semi integrate TortoiseHg with Notepad++ using thg annotate "$(FULL_CURRENT_PATH)" to show the history of the current file for anything else Workbench 回答2: If you add the following to our config file you can use Notepad++ to open files. [tortoisehg] editor = <path\to\>Notepad++.exe ["$FILE" -n$LINENUM] -multiInst -nosession You can get more information at https:/

TortoiseHg: Push Branch

北战南征 提交于 2019-12-05 16:52:04
问题 I am working on some bugs in our code base and I have created separate branches for each bug. I have rebased one of the branches on top of default. I generally use the mercurial plugin for Eclipse and I would do a push (when I am in the default branch). This pushes my changes on the default branch. I tried to do the same thing with TortoiseHg. When I press push, the client complains that I am about to create remote heads/create new branches on the server. Is there some way to push only

Mercurial - log last month changes

梦想的初衷 提交于 2019-12-05 14:01:16
I'm using TortoiseHG with mercurial and I have to log my changes from last month. It has to be something like this in GIT: git log --since="2015-03-01" -p --author='me' > C:\history_3.log Can you tell me how can I do it (using tortoise gui or terminal)? You want to make use of mercurial's revsets, a very powerful language to filter the revisions listed: hg log -r"author('YOURNAME') and date('>2015-03-01')" or alternatively for the last 30 days: hg log -r"author('YOURNAME') and date('-30')" . See hg help revsets and hg help dates . EDIT: Using tortoiseHG, you can use the magnifying glass icon

How to recover files that have been deleted from shelf in tortoisehg program?

余生颓废 提交于 2019-12-05 11:59:56
问题 I was trying to delete an individual file from my shelf and it turns out the delete button deletes all of the files in the shelf instead. Is there a way to recover these files besides going into .hg/Trashcan and trying to remember which of those files were deleted? 回答1: The best way to do this, as you alluded to, is to go into the .hg/Trashcan and copy the shelf file back into the .hg/shelves folder. Obviously if you order or list the trashcan folder by date you should be able to see which

觖决问题: TortoiseHg waiting for lock on working directory of X:\woks\2017\proj\FPGAFW@proj held by &apos;&apos;

时光毁灭记忆、已成空白 提交于 2019-12-05 11:55:37
问题 % hg add -- pll3.inc pll3.vhd pll3_inst.vhd pllClock.vhd waiting for lock on working directory of X:\woks\2017\proj\FPGAFW @proj held by '' 解决方法 关闭TortoiseHg后,删除这个文件: .hg/wlock 版本 TortoiseHg: 4.5.3 it should be : delete the file .hg/wlock 参考 https://codeyarns.com/2011/01/20/mercurial-waiting-for-lock-2/#comment-65155 Problem Mercurial repositories can sometimes be left in a locked state. A lock is created whenever a client is connected to a repository. But, this lock is not removed if the client got disconnected, say over the network. If any client now tries to change the repository (say