mercurial

setting up mercurial/kiln subrepos on osx

好久不见. 提交于 2019-12-20 05:53:15
问题 I have been trying to follow the instructions in the answer to this question, using kiln. i'd like to be able to arrange things as follows: /somepath/thirdparty maps to a kiln repository "thirdparty" and contains assorted code /somepath/common maps to a kiln repository "common" and contains shared code i have written and /somepath/project1 maps to kiln repository "project1" /somepath/project1/thirdparty maps to branch of thirdparty above /somepath/project1/common maps to branch of common

How to clone a codeplex mercurial repository behind a proxy?

冷暖自知 提交于 2019-12-20 03:45:06
问题 I am using TortoiseHG version 2.4.2 and with either firefox or internet explorer I can browse the following codeplex project just fine. https://hg.codeplex.com/oxyplot The problem is that I cannot clone the repository on my local computer. Initially, I used to get errors like this, URLError: [Errno 10061] No connection could be made because the target machine actively refused it Some google-fu later (HOURS later), I figured out that I needed to set proxy settings for tortoiseHg, which

hg diff on MySQL Workbench files

六眼飞鱼酱① 提交于 2019-12-20 03:07:40
问题 I'm posting this as a Q&A to document a workaround for a problem that seems to come up frequently—how to put MySQL Workbench files under version control—but for which I have been unable to find any solutions. Feedback is welcome! How can I tell Mercurial to diff the contents of a zipped archive and ignore some of the changes to those contents? Specifically, how can I use hg to diff the contents of a MySQL Workbench ( .mwb ) file, ignoring the many unimportant changes that MySQL Workbench

Compress away all parents in a repository?

对着背影说爱祢 提交于 2019-12-20 02:28:58
问题 I removed my last question because I think I'll ask a more simple question: Is there a way to compress ALL parents of a node (Basically, "pretend the repository starts here"). So turn o---o----o---o----o ....... x--+--+----+--+----+ \ \ / \ / o---o---o----o *----*---* into x--+--+----+--+----+ \ / *----*---* (Even better if I can modify x, but beggars can't be choosers) 回答1: Here's how I would approach it by making a new repo that will have the history you'd like using the Convert Extention:

Is hg clone equivalent to hg (init→pull)

强颜欢笑 提交于 2019-12-20 02:06:47
问题 At work I am using a svn repository shared among 7 people. To avoid plaguing my mistakes with commits and breaking the builds for everyone and to avoid branching in svn , I have a created a hg repository in a part of the svn directory I am currently working on. I perform local commits on hg as I work and since I have this all setup on a virtual machine, I am even pushing my hg repository to a private centralized location. Recently I migrated to Mac OS X lion which broke my virtual machine, so

Mercurial - Add project which is not within repository folder

大城市里の小女人 提交于 2019-12-20 01:39:47
问题 I am an inexperienced Mercurial user. I am using VS2010 with Mercurial. I had everything working nicely against a single repository, which contained a solution file and two projects nested within the 'parent' folder. Whenever I changed a file then the commit process would detect the change etc, etc. Then I added a third project. I added this project in a new folder, where the new folder was a peer of the top-level folder containing the original solution file (with original 2 projects nested

Workflow to “backport” change into different Mercurial (Hg) branch?

故事扮演 提交于 2019-12-19 13:56:22
问题 We have two heads. One is our main development head and the other is one that I forgot about until today. We found a bug and fixed it in our main development branch, and I just realized it should be fixed in the older branch as well. I think it would have been better to make the change on the older branch and merge that with the up-to-date branch, but we didn't do it that way. Can mercurial handle this? We haven't tried to do anything like this and I can't really wrap my head around how it

Python Popen failing to use proper encoding in Windows PowerShell

微笑、不失礼 提交于 2019-12-19 09:28:09
问题 I am running my Python script in Windows PowerShell, and the script should run another program using Popen, then pipe the output of that program (Mercurial, actually) for use in my script. I am getting an encoding error when I try to execute my script in PowerShell. I am quite sure it is happening because Python is not using the correct encoding that PowerShell is using, when getting the output of the Popen call. The problem is that I don't know how to tell Python to use the correct encoding.

hgweb.cgi throws a 502 (bad gateway) when pushing

一笑奈何 提交于 2019-12-19 07:43:29
问题 I've configured hgweb.cgi behind iis7 on windows server 2008. I can pull the repository just fine. However whenever I push I get a 502 bad gateway. I've found a posting which seems to indicate this is a problem with the mercurial config on the server. mercurial doesnt seem to be picking up an http proxy (fiddler) from my local machine even if its configured. Questions are: how do I 'fix' the 502 problem? failing that how do I make mercurial use the proxy so I can figure out whats going wrong?

hgweb.cgi throws a 502 (bad gateway) when pushing

若如初见. 提交于 2019-12-19 07:40:11
问题 I've configured hgweb.cgi behind iis7 on windows server 2008. I can pull the repository just fine. However whenever I push I get a 502 bad gateway. I've found a posting which seems to indicate this is a problem with the mercurial config on the server. mercurial doesnt seem to be picking up an http proxy (fiddler) from my local machine even if its configured. Questions are: how do I 'fix' the 502 problem? failing that how do I make mercurial use the proxy so I can figure out whats going wrong?