tortoisehg

Recommended way to coordinate versions of multiple dependent mercurial repositories?

徘徊边缘 提交于 2019-12-05 09:48:48
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 subrepos? All that said, if we keep our class libraries in seperate repos, and the recommended approach is

Using subrepositories with bitbucket and ToritoiseHg

為{幸葍}努か 提交于 2019-12-05 08:58:11
I have subrepository structure as following in TortoiseHg: /MainFolder/ /MainFolder/SubFolder1 /MainFolder/SubFolder2 MainFolder is a private repository on bitbucket SubFolder1 is a private repository on bitbucket SubFolder2 is a private repository on bitbucket The file .hgsub inside MainFolder looks like this: SubFolder1 = SubFolder1 SubFolder2 = SubFolder2 The file .hgsubstat inside MainFolder also have valid guids and subrepository names. The problem is whenever I try to push to bitbucket for MainFolder, first it pushes the MainFolder, then SubFolder1, but when it gets to SubFolder2,

Remove a revision in TortoiseHG and Mercurial

旧时模样 提交于 2019-12-05 06:35:45
In my repository I needed to revert to an older revision. I did reverting and made the changes I needed to. How do I push the new revision upstream? I was on rev 17 when I needed to revert back to rev 13. Now that I've made my changes, I'm on rev 18. Thing is, when I go to push these changes up (I'm using TortoiseHG), I get an error "abort:push create new remote head . I don't want to do a merge. Do I want to do a force with the --force command or do I need to delete rev 14-17. If I need to delete, how do I delete 14-17.? Proper solution is to actually merge with option Discard all changes

How to remove largefiles from Mercurial repo

妖精的绣舞 提交于 2019-12-05 05:10:39
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 requires file), but after a few pushes/pulls the folder and the require's line come back. Is there a way

What's the best way to version control graphical assets on Windows?

大兔子大兔子 提交于 2019-12-05 02:50:32
I'm a web developer / designer, and I want to be able to version control graphic files (Photoshop / Fireworks / Illustrator / Stock Photos / etc). This would normally be fine but some of the files I have tip the scales at around 800MB, which TortoiseHG chokes on. I currently have a server I put all my files on so all my computers can access (it's my work computer and I have some flexibility as to installing some linux packages). Any advice on the best way to go about this would be appreciated. Unless those graphic files changes every day, a better way to store them would be to: avoid VCS (CVCS

Set or change THG (TortoiseHg) branch color

夙愿已清 提交于 2019-12-05 02:46:18
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. 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 = Stable:#FC951E , using orange for the Stable branch Stable:#FC951E As documented officially, the value is

Mercurial .hgignore Negative Lookahead

て烟熏妆下的殇ゞ 提交于 2019-12-05 02:38:46
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: ^(?!keepers/).+$ Regrettably, this causes all files to be ignored. If I change it to: ^(?!keepers).+$ it works

TortoiseHG and hgsubversion (Windows): “no module named hgsubversion”

点点圈 提交于 2019-12-05 02:04:47
I have installed the newest version of TortoiseHG for Windows from https://tortoisehg.bitbucket.io/download/index.html (2.8.1) I did hg clone http://bitbucket.org/durin42/hgsubversion . And have the correct path set in mercurial.ini: [extensions] hgsubversion = C:\hgextensions\hgsubversion\hgsubversion If I do: hg version --svn I can see that hgsubversion seems to be installed correctly: Mercurial Distributed SCM (version 2.6.2) (see http://mercurial.selenic.com for more information) Copyright (C) 2005-2012 Matt Mackall and others This is free software; see the source for copying conditions.

What to do when a patch for Mercurial import fails?

房东的猫 提交于 2019-12-05 00:53:13
I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this: applying G:\OSS\premake-dev\premake-dev_rev493.patch unable to find 'src/host/scripts.c' for patching 3 out of 3 hunks FAILED -- saving rejects to file src/host/scripts.c.rej patching file src/base/api.lua patching file src/host/scripts.c patching file src/tools/bcc.lua file tests/test_bcc.lua already exists 1 out of 1 hunks FAILED -- saving

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

*爱你&永不变心* 提交于 2019-12-05 00:11:29
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 problem is that I cannot get it to do anything. I use the filename (with/without path), glob:filename,