tortoisehg

How do you disable mercurial from leaving .orig files after a merge?

老子叫甜甜 提交于 2019-12-18 12:05:42
问题 After updating TortoiseHg+Mercurial a while back I am starting to get .orig files after merges. I have looked at the solutions for removing/purging them but I am looking for a way to disable the files from being left behind. After doing merges fine without these files appearing I was wondering if this was something new that could be turned back off. 回答1: Update: According to the Mercurial config documentation the defaults section is deprecated. The Mercurial wiki is also particularly critical

tortoiseHG suddenly fails with “Unable to remove file xxx permission denied”

一个人想着一个人 提交于 2019-12-14 01:32:25
问题 I have about 50 modified files. I tried to shelve them. About halfway through, tortoiseHG says 'Unable to remove file x/y/z/foo.java, permission denied'. I tried several of the remaining files, and they all seem to have the same issue. I've been using tortoiseHG for a long time on this Windows machine without issues. Any suggestions on how to troubleshoot this? The files are not locked (open by another program). And they're all in the same local directory that I have access to. 回答1: Figured

Mercurial - Ways to resolve abort: error: '' after an hg in/pull

若如初见. 提交于 2019-12-13 21:34:46
问题 A perfectly good repository goes pear shaped after an unknown time. A simple hg in fails with an error abort: error: '' Sometimes it just hangs for a few minutes without any output. If I run with --verbose , same output. If I run with --traceback , I get: Traceback (most recent call last): File "mercurial\dispatch.pyo", line 88, in _runcatch File "mercurial\dispatch.pyo", line 740, in _dispatch File "mercurial\dispatch.pyo", line 514, in runcommand File "mercurial\dispatch.pyo", line 830, in

How to download code using TortoiseHg (Mercurial)

荒凉一梦 提交于 2019-12-13 14:28:05
问题 I am trying to download the code theworldsworststackoverflowclone. At first I have tried with Tortoise SVN but later get to know that hg command is not supported. Now I downloaded Mrcurial and TortoiseHg 2.0.2 with Mercurial 1.8.1 - x64 Windows and installed on my system. I have also tweaked the proxy settings required. But whenever I am trying to clone , then I am getting the following error: Clone not found [Command returned Code 225] 回答1: It worked for me. I'm using TortoiseHg (1.1.5) and

How to delete remote commit from bitbucket mercurial repository

£可爱£侵袭症+ 提交于 2019-12-13 11:52:07
问题 How to delete a remote commit from bitbucket mercurial repository? Findings: I could not found "Repository management" in the "Admin" section. which is mentioned in this answer. Is this feature deprecated/dropped from bitbucket? If not where it is? Note that I am owner of the repository. Note for expert! only: Remember I have already pushed my commit to bitbucket. I know deleting commit is not good, I am not interested to a backout my history by adding an extra commit. Moreover I can ensure

Tortoisehg push or commit fail with “ret 255”

血红的双手。 提交于 2019-12-13 07:02:49
问题 I've been using Tortoisehg for a while now, with little to no problems but have just run into the following problem: I cannot push or commit to my main repository. I made a small change to one file in my project, committed locally with no problem, but the push to the main repo fails: % hg --debug push "Z:\[main repo]" pushing to Z:\[main repo] query 1; heads searching for changes all remote heads known locally listing keys for "bookmarks" 1 changesets found list of changesets:

How to get Tortoise HG to detect changes in files based on directory again

*爱你&永不变心* 提交于 2019-12-13 04:31:53
问题 The simplest way I can describe this is that I have a project in Windows 7 under version control with tortoise HG version 2.8.1 using Mercurial-2.6.2, I am using bitbucket.org as my remote repository. When I go to click HG commit on a folder with a red exclamation point on it (meaning files that need to be committed). It tells me No files found for this operation But when I click on files in that directory that have the red exclamation point, It brings up the normal commit menu expecting me

Windows Tortoisehg can't show incoming preview

扶醉桌前 提交于 2019-12-13 03:51:51
问题 On windows tortoisehg, clicking "incoming" can't show the list of incoming changesets, only saying "incoming changesets found". How to make the incoming changesets shown? 回答1: There is a Branch combo box that allows you to see only a specific branch. This combo box is at the top of your graph in TortoiseHg, if you enable the Graph Filter (CTRL-S). In your case, it is quite probable that you already selected a specific branch. Having this combo box to anything else than Show All , will show

Mercurial: Windows client for remote development

纵饮孤独 提交于 2019-12-13 02:45:56
问题 This question was migrated from Super User because it can be answered on Stack Overflow. Migrated 9 years ago . We have a test server where every developer has their own sandbox. In fact, our web project is so huge that we can't allow developers to edit everything even in sandbox. For example, there are some password files from some other web services that developers don't have permissions to see. Anyway, the thing is, we can't allow developers to clone whole projects to their own PC's for

Using Mercurial (hg), how to push just one file or one directory out?

☆樱花仙子☆ 提交于 2019-12-12 16:03:42
问题 Using Mercurial, we can commit one file by using hg commit file.rb or 1 folder hg commit foldername But how can we push just 1 file or 1 folder out? The whole project can be pushed using hg push ssh://peter@192.168.1.102//project/code/preliminary but there seems to be no way to push out just 1 file or 1 folder? I tried the following and they don't work: hg push ssh://peter@192.168.1.102//project/code/preliminary app/views/index.html.erb or hg push ssh://peter@192.168.1.102//project/code