mercurial

Removing file from Mercurial MQ Patch

I have large MQ patch applied in Mercurial. What has happened is I have done qrefresh and included files in my patch that I do not want to include. Is there a way to remove the changes to these file from my patch with out manually editing it? In this case if I was just working without MQ, all I would have to do is hg revert. ...

Excluding project configuration files from commits in Mercurial

I have a project that requires some configuration files. I want to keep the default configuration filse in the repository. However, I want don't want to have to specify the -X flag for every commit I do. Is there a standard way to mark a set of revisioned files as permanently excluded from commits? ...

Mercurial: Obtain the current changeset of a particular file

What is the easiest way of obtaining the changeset version of a particular file in Mercurial? A similar thing that we did for svn was to run "svn --info" in the command line and then obtain the Revision number. Is there any similar approach for Mercurial? ...

Converting SVN to Mercurial on Mac with working python binding doesn't work

Hi, I try to convert a local SCN repository (with all its history) to Mercurial. I am working on a Mac (10.6.2). Therefore, I am using Macports as package management tool. I started the conversion with: hg convert file:// ´pwd´/calebsvn/ The result is, that it starts to work fine, but after a while, it stops. That is the output: in...

Mercurial 1.5 pager on Windows

I'm trying to set the pager used for Mercurial but the output is empty, even if I specify the command in the [pager] section or as the PAGER environment variable. I noticed that the command provided is launched with cmd.exe. Is this the cause of empty output, and if yes, what is the right syntax? Environment: Mercurial 1.5, Mecurial 1....

(Yet another) What's the best conversion from an SVN repository to HG repository(ies)?

My company has a large Subversion (SVN) repository, and for various reasons, we are considering migrating to Mercurial (HG). I'm hoping to learn the "best practice" ideas for our situation. Our SVN repository is fairly monolithic, and looks something like this: trunk Python_Project_1 Python_Project_2 Python_Shared_Code Flex_Code ObjC...

How do I convince my team to move from SVN to Mercurial?

The team I'm working with uses SVN for keeping version control. (It was used for years by them.) Recently I found Mercurial as a VCS and it looks much convenient for me than SVN. What arguments wound you suggest most convincing in order to move to Mercurial? ...

Cross-repository merging in Mercurial?

I am considering a switch from SVN to Hg and currently have a typical SVN layout for project Foo: Foo trunk branches 1.0 1.1 I can import this structure into Hg using the hg import command, creating a separate repository for the trunk and two branches (by using the --config convert.hg.clonebranches=1 import switch.) Now, ...

Mercurial annotate --include not finding files

Hi, I'm trying to to get Mercurial's annotate command to work on files specifed by an include pattern. When I run the test batch file below, hg annotate --include *.txt gives me the following error: abort: at least one filename or pattern is required As you can see, I'm using the same pattern to add the files to the repo, so I'm no...

Converting a SVN project containing tags to Mercurial

I am attempting to use the hg convert Mercurial command against an SVN repository that has a trunk and some tags (but no branches.) The SVN folder layout looks like this: Foo tags 1.00a 1.00b-test trunk Although the import succeeds, it would appear I am only gettting the trunk and the tags are nowhere to be seen in the Hg...

Is Subversion more "supported" by continuous integration tools than Mercurial?

We are currently using NAnt on our build server, with CVS as our source control system. Seeing the need for improvements, we are investigating continuous integration tools and other source control systems. Subversion seems to be the most straightforward option to move on to from CVS, but a distributed version control system like Mercuri...

Embedding mercurial revision information in Visual Studio c# projects automatically

Original Problem In building our projects, I want the mercurial id of each repository to be embedded within the product(s) of that repository (the library, application or test application). I find it makes it so much easier to debug an application being run by customers 8 timezones away if you know precisely what went into building the...

Case-insensitive diffs in Mercurial

I'm using Mercurial (specifically TortoiseHg on Windows) to do version control of VBA code. Anybody who's tried this knows that VBA changes the case of every variable throughout a project whenever any declaration of that variable is changed anywhere in the project (regardless of scope). It makes version control a nightmare. I would li...

Is there a way to get the Tortoisehg repository explorer to start from a command prompt?

Is there a way to get the Tortoisehg repository explorer to start from a command prompt? ...

DVCS how structure with large integrated code base, with multiple projects sharing much common code?

I have a cvs repository, with mostly java code. Each package sits in it's own top level dir, like so, with the sourced laid out in typical java fashion. $CVSROOT/my.domain.module1/src/my/domain/module1 $CVSROOT/my.domain.module2/src/my.domain/module2 $CVSROOT/my.domain.share1/src/my/domain/share1 This means we can write build scripts...

How to make mercurial ignore all hidden files?

I hate seeing nearly every directory in my repository list each file twice, once with a dot in front of it and once without. I tried adding .* to my .hgignore file, but it has no effect. Is this the wrong syntax, and more importantly, is it a bad idea to try this in the first place? Thanks. ...

Setting up Mercurial/TortoiseHg to work with UltraCompare

Hi, I'm trying to get my favorite Windows diff/merge tool, UltraCompare (V7.00) to work with Mercurial/TortoiseHg. I have set up UltraCompare in my Mercurial.ini like this (only relevant bits shown): [merge-tools] UltraCompare.executable = C:\Programme\IDM Computer Solutions\UltraCompare\uc.com UltraCompare.args = $base $local $other U...

How can I group several mercurial repositories in one?

I'm working on a project that use Mercurial as his source control manager. The directory structure is the following: repo/mylib1/.hg repo/mylib2/.hg ... repo/myApp/.hg I want everything under an unique repo (ie: repo/.hg) and, ideally, I want to keep the file history of each repo. Can I do that with Mercurial? How? Thanks! ...

Best Practices for Source Control Dependencies

How do you handle source control setup of a non-compiled project that has dependency on a separate framework or library? For example, Project A uses Framework B. Should Project A also include the code from Framework B in its repository? Is there a way for it to be included automatically from a different repository or would I have to upda...

How do I configure Mercurial to use environment variables in mercurial.ini

How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal. The .hgignore file includes filter...