mercurial

Keeping a VCS-held open source project mod up to date while using DVCS for managing my mod's changes

I would like to mod an open source project held in SVN. I would like to use Mercurial to hold my mod in version control. (The reason for Mercurial is that I would like to keep track of changesets so that I can split up the mod into components - this is necessary for working with the OpenCart project for example as it doesn't support ext...

Including mercurial extensions from eggs

Is there some way to import an extension from an .egg file? For example hggit installs itself as hg_git-0.2.4-py2.5.egg, which cannot be listed under [extensions] directly, or it's interpreted as a standard .py file. Is there some way to include that file as an extension? Alternatively, is there some way to install hg-git manually in a...

Mercurial: beheading a head

There is a commit that just didn't work, so I want to abandon it without deleting it from history. I have updated from an earlier revision and committed, thus creating a new head. I don't have branches, I don't want branches, I just want to simply go on with the new head exactly as it is, nothing fancy, no merge, no worries, just go on...

How can I push/pull an individual changeset between repositories in Mercurial?

I have the following situation: I have site A, which has it's Mercurial repo, and we've been developing it for a while. Let's say A has had 5 revisions. We now has to create Site B, which is almost identical to site A, except for graphical design, mostly. So I cloned the repo, started site B, and now B's repo has all of A's history, pl...

CCNET Trunk start building because of changes set on branch

I am using CCNET in combination with Mercurial. I have a project that got a branch and a head. they are both configured in CCNET. The branch is running fine, it only start building when there are changes on this branch. The trunk (called default) starts building every time modifications are checked, because it "sees" the change sets of ...

make a cross change in a file with mercurial

I'm new to mercurial, so may be my question is stupid. Let say you made a mistake when you first started working on your code. For example, you putted instead of Now you want to change this, but not only to the latest revision, but to all revisions and versions of your page. Is this possible? ...

What is the right way to avoid shamap corruption when converting mercurial repositories?

I'm trying to build a pruned Mercurial repository from a larger one and need to pull in changes from several branches. I want to use hg convert, but I am getting errors like abort: unknown revision '81b79760e1350d185dbf645ab67633eda9d52ada'! when try to use convert to get changes from a related branch. Here's what I did. I star...

Mercurial qfold ALL patches?

Turns out there is no hg qfold -a. I tried hg qfold $(hg qunapp) and hg qunapp | xargs hg qfold but couldn't get it to work. Any ideas? ...

Custom Mercurial on Windows

There are some options for me for Mercurial on Windows (I know there is the .msi), most likely: Cygwin Bare Python I'd like to keep a custom mercurial install with some extensions (most likely for GIT/SVN Integration) for three machines (Win32 / x64). So, its likely I'd need to keep the python runtime installed as well. How would yo...

How to manage concurrent development with mercurial?

This is a best practice question, and I expect the answer to be "it depends". I just hope to learn more real world scenarios and workflows. First of all, I'm talking about different changes for the same project, so no subrepo please. Let's say you have your code base in an hg repository. You start to work on a complicated new feature A...

Suggestions for Distributed Version Control in Eclipse

We're a small software company that has been using CVS and SVN for version control (and Eclipse for writing code) for about 10 years. We're now considering switching some of our projects to use a distributed version control system. We're looking to use something like git, mercurial, etc. But--and here's the key--our new system has to...

Team Foundation Server 2010 and Offline development?

Did Microsoft add anything to improve offline development? I'm comparing TFS with Mercurial. Edit #1: Work Environment Details 20 Developers. 1 location. TFS 2005 is already installed, but only being used by 4 developers. Those that use TFS, are only using it for Source Control Others using VSS. :( Many small projects (Over 50 proje...

How to apply a collapsed revisions patch to trunk in Mercurial?

Hi! I am looking for best practices to do the following: When I need to implement a feature or fix a bug, I am creating new Mercurial repository from the main one (a trunk). Then, within some days, or weeks, I am implementing the task in newly created repository, making commits and periodically merging with trunk. After the code in new...

Visual Studio and TortoiseHg: folder not visible in VS

I created a C# project and added it to source control (mercurial). I can edit files in VS, commit it and push it using TortoiseHg. It goes to the server. When some one pulls they get the files. In my visual studio I added a folder and a file inside that folder. I used TortoiseHg and it saw the new file in the new folder. I committed it ...

mercurial repository corruption

Hi, I’m new to mercurial, about 2 months now. We are using it on a new project and tried to create a new repo, a clone of the trunk, to be used as release “branch”. We use a central repo, everyone is pulling/pushing to/from it over https using hgwebdir.cgi. Using on server hg 1.5.4 and “clients” various versions, 1.5.2 -> 1.6.3 Everyth...

Files with .sql extension identified as binary in Mercirial

I generated a complete set of scripts for the stored procedures in a database. When I created a Mercurial repository and added these files they were all added as binary. Obviously, I still get the benefits of versioning, but lose a lot of efficiency, 'diff'ing, etc... of text files. I verified that these files are indeed all just text...

Mercurial Experimentation Workflow

I've encountered a problem in my Mercurial workflow when experimenting with implementing a certain feature. I was trying three different approaches to implementing the feature by commiting each update followed by updating to the previous changeset - so I end up with three different branches. Once I have chosen one of the branches to be...

MercurialEclipse on Windows 7 64bit: doesn't install "Windows Binaries for Mercurial"

Hi, set up my machine at work (WXP 32bit) and MercurialEclipse in Eclipse Helios from market place worked without problems. At home I did the same procedure but on W7Pro 64bit. MercurialEclipse itself got installed, but it errored out upon Workspace restart that the hg command was not found; and it's true, there was none installed. Co...

How to ignore hgignore when reverting (aka remove all useless files)

I have a .hgignore file that works great for hiding all the files and directories creating when compiling my C# projects. Now when doing a "revert" to a previous revision, I would also like to clean up my working directory, ie remove all the exes and dlls that I've previously compiled (as I may end up using the wrong version of an exe o...

CVS to Mercurial conversion with CRLF

I have converted a CVS repository to Mercurial, but the carriage returns are converted from CRLF (Windows style) to LF (Unix style). However, I want CRLFs in the repository! I realise that you can combat this problem with Mercurial extensions win32text and eol. But I would really prefer to have the repository converted with CRLFs in the ...