tortoisehg

Fix bad merge in mercurial

烈酒焚心 提交于 2019-12-23 17:18:47
问题 In our mercurial project configuration we have 3 branches in a single repository. One is a stable release branch where urgent bug fixes are done, one is a feature branch which contains new feature code and one is a UAT branch where both bug fixes and new features are merged into to provide the most up-to-date code base. We have merged a whole load of new feature code into the UAT branch without any issues at all. Following that we merged the stable branch with the bug fixes into the UAT

TortoiseHg can't commit--“The system cannot find the file specified”

北战南征 提交于 2019-12-23 07:29:23
问题 I just picked up TortoiseHg to use for distributed source control on Windows and installed it on my C drive. Then I created a repository (located in D:\projects). When I try to commit the changes, it gives me the error "abort: None: The system cannot find the file specified" in a new window titled "Commit". This causes the commit to abort. It doesn't specify any file, and when I run hg --traceback commit -m 'Message' it gives this as output: Traceback (most recent call last): File "mercurial

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

拈花ヽ惹草 提交于 2019-12-22 12:07:50
问题 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

Recommended way to coordinate versions of multiple dependent mercurial repositories?

喜你入骨 提交于 2019-12-22 07:01:31
问题 Well, after many hours of reading and trial and error, it has finally hit me. Mercurial doesn't really want to do SubRepos...at least not with TortoiseHg and Bitbucket. If I am mistaken, and you don't want a down vote for a rude response similar to "of course it works, didn't you read the official docs", then please provide a simple example of how to do so via TortoiseHg latest that will successfully push to Bitbucket. Maybe a open source project that utilizes mercurial and bitbucket and

How to remove largefiles from Mercurial repo

谁说胖子不能爱 提交于 2019-12-22 04:53:06
问题 See also this question. Without knowing what I was doing, I enabled the largefiles extension, committed a file and pushed it to kiln. Now I know the error of my ways, and I need to permanently revert this change. I followed the guidance from SO on the subject; and I can remove largefiles locally, but this doesn't affect the remote repos in kiln. I have tried opening the repo in KilnRepositories on the Kiln server and nuking the largefiles folder (as well as deleting 'largefiles' from the

Set or change THG (TortoiseHg) branch color

一笑奈何 提交于 2019-12-22 04:31:13
问题 Sometimes by accident, or by who knows what, TortoiseHg changes branch colors. I tried to find in the documentation how to set branch colors explicitly, but it didn't worked. I tried an extension named 'color' but don't know how to configure it. 回答1: It seems the Workbench settings UI can help with the correct syntax for the config file. It can be used as documented: branchname:#HTML_Color , just need to put it in the correct setting name What is in the config file at the end is: branchcolors

Set or change THG (TortoiseHg) branch color

二次信任 提交于 2019-12-22 04:31:01
问题 Sometimes by accident, or by who knows what, TortoiseHg changes branch colors. I tried to find in the documentation how to set branch colors explicitly, but it didn't worked. I tried an extension named 'color' but don't know how to configure it. 回答1: It seems the Workbench settings UI can help with the correct syntax for the config file. It can be used as documented: branchname:#HTML_Color , just need to put it in the correct setting name What is in the config file at the end is: branchcolors

Has anyone had success with TortoiseHg's “Auto Exclude List”?

依然范特西╮ 提交于 2019-12-22 03:50:51
问题 I have a config file which I often modify in order to do some testing. About 95% of the time I modify this file, I do not wish to commit to the repo. It's a nuisance to always be on the lookout during commits. I discovered this supposedly nifty feature in TortoiseHg called "Auto Exclude List" which is supposed to take a comma-separated list of files that you want to default to unchecked (on commits, reverts, shelves). This sounded like a perfect, non-hackish way to make my life simpler. The

Mercurial .hgignore Negative Lookahead

自作多情 提交于 2019-12-22 03:46:49
问题 Using Mercurial, I need to ignore all files except for those in a certain directory called "keepers". On the face of things, this seemed easy using Regex and Negative Lookahead; however, although I am able to verify my regex in Regex Buddy and other tools, in TortoiseHg, it doesn't work as expected. Files: junk\junk.txt junk\text keepers\test\test keepers\test\test2\hi.txt keepersblah.txt Only the two files under keepers should be not be ignored. Here is the regex I hoped would work: ^(?

Mercurial: Getting changed files from revision?

岁酱吖の 提交于 2019-12-21 21:28:59
问题 I can't get my head around how I can get only the files that were changed in my last revision, and not the complete repo, which i get by using Clone. This would be super helpful to for instance, deploy the last changed files. What do I do? Thanks 回答1: Martin has the right way to get a list of what files have changed in a revision, and I've upvoted his answer, but just to expand on why your question is a little off: In Mercurial every location has a full copy with all changes. If you're going