mercurial

How to set permissions so two users can work on the same hg repository?

Ubuntu: Jaunty Mercurial: 1.3.1 Access: ssh (users john and bob) File permission: -rw-rw---- 1 john john 129276 May 17 13:28 dirstate User: bob Command: 'hg st' Response: **abort: Permission denied: /our/respository/.hg/dirstate** Obviously mercurial can't let bob see the state because the file it needs to read belo...

Can I change the diff tool used in TortoiseHg?

Hi, I use TortoiseHg to commit changes. The diff that is shown in the commit dialog contains a lot of additions/deletions. I configured KDiff3 as external diff tool. When I click on the diff icon in the commit dialog, KDiff3 opens and that comparison is a lot more 'intelligent': it detects 'better' what I changed: I moved a block of co...

Mercurial vs Subversion. Whose performance is better?

There are a lot of articles about SVN vs. Hg in general. I would like to concentrate only on performance. Real-live experiences preferred. Here is my set-up: (future setup) Windows with IIS fro Hg (current setup) SVN 1.3.2 on top of apache under windows I would like to have statistics for most commons operations (commits, stats, loc...

Best Practices for Project Feature Sub-Modules with Mecurial and Eclipse?

I have a couple of ANT projects for several different clients; the directory structure I have for my projects looks like this: L___standard_workspace L___.hg L___validation_commons-sub-proj <- JS Library/Module | L___java | | L___jar | L___old_stuff | L___src | | L___css | | L___js ...

Using UNC path as paths location in Mecurial IIS6 Server2003

I'm running the latest Mercurial and Python 2.6; IIS6 is using the wildcard ISAPI method to attach the site to the Mecurial hgwebdir_wsgi [paths] \ = \\COMP3254\TestRepo\* [web] baseurl = / allow_push = * push_ssl = false style = monoblue The setup works perfectly if I reference the local drive E:\repo* but doesnt work if I specify t...

Mercurial: How to ignore changes to a tracked file

I have a file with database settings in my project which I have set to some defaults. The file is tracked by mercurial and checked in. Since this file will be edited with different values various developer machines, is there a way I can tell Mercurial to ignore new changes to this file? I tried adding the file to the .hgignore file, but...

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) ** Extensions loaded: Traceback (mo...

How do you prevent your Mercurial (or Git) branches from being locked up?

I want to throw this scenario out there and see what the most objective, vanilla-Mercurial way to fix this would be. Suppose I have the following branches in my centralized Mercurial repository for my centralized, non-distributed web-app: repository default feature1 feature2 bugs Suppose ten developers have committed ...

Pushing a local clone to remote repository with Mercurial

Here is what I did: Cloned a remote repository to my local computer. Created a second clone from the first clone. Made changes in the second clone. Never touched anything that resides in the first clone. Now what happens if I directly push to remote repo from the second clone? A new branch is introduced in the remote repo? Maybe a stu...

What does a mercurial revision with no parent mean?

I have a Mercurial repository that is in a strange state now. This is what it looks like in TortoiseHG: I didn't think this would be possible. Revision 54 has a parent of "-1 (000000000000)" (i.e. nothing). There's clearly something I don't understand yet about Mercurial, can anyone let me know what this means - and what must have hap...

Mercurial Subrepos, how to control which changeset I want to use for a subrepo?

I am reading up on subrepos, and have been running some tests locally, seems to work OK so far, but I have one question. How do I specify/control which changeset I want to use for a particular subrepo? For instance, let's say I have the following two projects: class library application o fourth commit ...

Hosting Mercurial on IIS7

Note, this might perhaps be best suited on serverfault.com, but since it is about hosting a programmer source code repository, I am not entirely sure. I'm posting here first, trusting that it'll be migrated if necessary. I'm attempting to host clones of my Mercurial repositories on my own server (I have the main repo somewhere else), an...

Mercurial: Class library that will exist for both .NET 3.5 and 4.0?

I have a rather big class library written in .NET 3.5 that I'd like to upgrade to make available for .NET 4.0 as well. In that process, I will rip out a lot of old junk, and rewrite some code to better take advantage of the new classes and support in .NET 4.0 (like TPL.) The class libraries will thus diverge, but still be similar enough...

Can one Mercurial repository live inside another Mercurial repository?

Can one hg repo live inside another hg repo on my local file system? I am pulling down the bitbucket wiki for 'sandbox', and I want to know if this should be placed in repos/sandbox/wiki or repos/sandbox-wiki. Is the former okay to do? ...

How to work with overlapping repositories in Mercurial

Often I want to have a main repository of source, shared by several "similar" projects. Each sub-project contains most of the same files, but is a specific configurable instance. That means there are usually a bunch of files and directories that need to be different for each instance. In CVS I used to create the main repository and the ...

VS Solution and Mercurial repository layout for a c# project with plugins and external libraries.

I'm developing a project in .NET (using C# to be more specific). Using Visual Studio as an IDE. Using Mercurial for version control. I'll be using some third-party libraries: ThirdParty.Foo.dll ThirdParty.Bar.dll ThirdParty.Baz.dll And some in-house libraries: Company.A Company.B Company.C Company.D (References t...

mercurial: less duplication in hgrc file

Hi there. I have using Hg for some projects on my google code hosting. For each projects I set in [auth] section of .hgrc the username/password to push without every asking for password. But it is lots of duplication like: [auth] proj1.prefix = ... 111 proj1.username = google code username proj1.password = google code password proj2.p...

Mercurial auto update problem.

We are starting to use Mercurial for source control. We have configured the HGRC configuration file to do an auto update after we push to the "central" repository. With some PCs we get this error msg: warning: changegroup hook exited with status -1 HGRC looks like this: [ui] username=ADMIN verbose=true [hooks] changegroup = hg upda...

Using Mercurial (HG) programmatically from C#/.NET

What's the best way to approach using Mercurial (HG) programmatically from C#? I will be creating HG repositories, committing, and using other default HG functions. Are there are open-source .NET libraries that would allow me to do this? Thanks in advance. ...

How should I setup my Visual Studio projects/solutions in a Mercurial repository?

At my company we have a few different web apps that each share some common libraries. The Visual Studio setup looks like this. Website 1 Solution Website 1 Shared Library 1 Project Shared Library 2 Project Website 2 Solution Website 2 Shared Library 1 Project Shared Library 2 Project Windows Service Solution Windows Se...