tortoisehg

Why can't I push this change to my 'main' mercurial repository?

孤人 提交于 2019-12-03 05:28:30
问题 I am trying to grok Mercurial and hope I am just getting confused here! I have a repository ('main') that I have cloned ('clone'), , both on my own machine. Both were completely in sync with each other. I decided to play with named branches so the next time I committed on my 'clone' I did it under a branch name of 'case1212' and while it seems to have dealt with the commit properly on my clone, I cannot push these changes back to 'main'. The error given is: abort: push creates new remote

TortoiseHG and TortoiseSVN play well together?

孤者浪人 提交于 2019-12-03 05:26:06
I had TSVN installed first and been using for a long time. Then I install T-HG and when I right click I dont see any TortoiseHG. Does anyone have this same problem? All the T-SVN overlays are still there. Starting with version 0.8 (released 2009-07-01) TortoiseHg supports Windows Vista 64bit explorer shell integration. Thanks to the new C++ shell extension (I contributed significantly to that). Check current release TortoiseHg-0.8.1-hg-1.3.1.exe available from http://bitbucket.org/tortoisehg/stable/downloads/ sivabudh EDIT This information is out of date. EDIT: I think this has to do with me

TortoiseGit, TortoiseBzr, TortoiseHg. Are any solid enough to switch from TortoiseSVN? [closed]

不羁的心 提交于 2019-12-03 04:50:23
问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 2 years ago . I'd like to try out a distributed revision control system. I use a couple Windows PCs, a couple PCs with Linux, and a Mac. On windows, I'd like to use Tortoise. Are any of the Tortoises other than TortoiseSVN any good? Until recently, the knock against them has been that they

What is the correct way to handle nested Hg repositories with Mercurial/TortoiseHg?

白昼怎懂夜的黑 提交于 2019-12-03 03:59:10
问题 I'm struggling on how to correctly track nested repositories using TortoiseHg. I have a main repository that tracks my whole project. This project contains several little plugins that are stored inside a plugins/ subdirectory. I would love to track each plugin independently (committing and pushing to BitBucket for each one of them) while still being able to make a "whole" commit of my project, including the changes made to the plugins and pushing it to an other location (not BitBucket). What

How to fix “remote: ssl required” when pushing to Bitbucket?

こ雲淡風輕ζ 提交于 2019-12-03 02:28:08
I am getting the above error whenever I try to push my changes. I am using TortoiseHg as client. Here is the debug output for hg push : pushing to https://nulldev@bitbucket.org/nulldev/windows-phone using https://bitbucket.org/nulldev/windows-phone proxying through http://[proxy - omitted] http auth: user nulldev, password not set sending capabilities command bitbucket.org certificate successfully verified [HgKeyring] Keyring URL: https://bitbucket.org/nulldev/windows-phone [HgKeyring] Looking for password for user nulldev and url https://bitbucket.org/nulldev/windows-phone [HgKeyring] Keyring

TortoiseHG/Mercurial Project Statistics and Reports

|▌冷眼眸甩不掉的悲伤 提交于 2019-12-03 02:23:24
I've been working for a couple months on cleaning up the backend of a system I'm working on. The previous code was awful so I've been refactoring and rewriting to get the code to a state where I can better add and improve functionality. I want to be able to quantify the work I've done for the client so he can get a sense of how much work has been done. So, I want to run some reports showing things like: number of lines removed, added, changed. I've used TortoiseHG/Mercurial all along and also have pushed the code up to bigbucket. What's the best way to generate these types of statistics from

How to let TortoiseHg (Mercurial) on Windows use the Private Key file generated (by Puttygen)?

纵然是瞬间 提交于 2019-12-03 00:53:21
问题 I have used Puttygen to create a public and a private key, and then is ready to let TortoiseHg on Windows 7 do a clone by going to ssh://somebody@code.somewhere.com/somecode but there seems to be no where to add the private key to TortoiseHg? (or even just the mercurial command line) The file is already some where on hard disk as somefile.ppk Does someone know how to add it? 回答1: Either add the following to the [ui]-section of the mercurial.ini in your home directory (assuming your key is in

Is there any way to change how graphs are drawn in TortoiseHg?

人走茶凉 提交于 2019-12-02 20:46:45
Being used to how ClearCase draw graphs I find Mercurial's and TortoiseHg's way confusing at first glance. This is how I'd like it to be represented: With static positions for branches. E.g. Maintenance branch to the left/right always and preferably in a straight line and not the current spaghetti curved branch it is now (see below link). This is how it looks using the TortoiseHg Explorer. The graph is from a test repository. :-) Is there any way to change how graphs are drawn in Mercurial? [edit] Check out MacHg and how it draws the graphs. This is more in line of what I'd like to see myself.

Use WinMerge as TortoiseHG Merge tool

与世无争的帅哥 提交于 2019-12-02 20:08:20
I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini: ; User specific Mercurial config file. ; See the hgrc man page for details. [ui] username = Bargio <> merge = winmergeu [extdiff] cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl [merge-tools] winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe winmergeu.priority= 1 winmergeu.fixeol=True winmergeu.checkchanged=True winmergeu.args= /e /ub /dl other /dr local $other $local $output winmergeu.gui=False [tortoisehg] vdiff = winmerge Visual diff works

Hg: How to move files (to subfolder) without losing history?

瘦欲@ 提交于 2019-12-02 19:58:06
How to move files (to subfolder) without losing their history? In my Mercurial repository (I mean the folder with the .hg in it) I have MyProject/ folder with all project files. Now I need to create src/ folder inside and move all files to it (from MyProject/ to MyProject/src/ ). How can I do it without losing all history? Fred the Magic Wonder Dog hg mv does do the right thing, but hg log does not list entries past the move unless you give it the -f option. See this question for more info Why 'hg mv' (mercurial) doesn't move a file's history by default? After you do this, you likely want to