mercurial

Is there way to tell Mercurial to put .orig files into a separate directory?

I don't like Mercurial polluting the source tree with .orig files and such. Is it possible to keep all such files in /tmp, for example? ...

Is it possible to set up a private Mercurial repository on Google Code?

I like the fact that Google Code is a free option for Mercurial hosting but, in the test project I set up I couldn't find a way to designate the repository as private. Ideally I would like to work on a project privately until it is ready for the world to see and only then open it up to others. Is there any way to do that on Google Co...

NetBeans + Mercurial + SSH = Endless Pull/Push

I have well working Mercurial. I can push/pull through cmd commands. But in NetBeans push/pull lasts forever. I've tried to push to BitBucket over http and it worked. But the same thing over ssh didn't. And the same ssh push with 'hg push ssh://...' worked. What's wrong with NetBeans? It may be some option i should change or smth. ...

Migrating Clearcase to X

I was asked to choose an open-source alternative to Clearcase-UCM, and I need an advice what would be the best match. Given below are some parameters I've collected: Half of the development teams use the Integration view, development view, rebase and delivery methodology. The rest just work straight on their integration stream with pri...

Flash AS3 with HG version number?

I'm using ant, hg, and the linux Flash as3 libraries to compile. I would like to include some sort of version info automatically, for debugging purposes. ...

Correct command to retrieve remote mercurial updates pushed from my second machine

I'm new to Mercurial. I initialized a Mercurial project on Machine A, committed my changes and uploaded them to a remote repository. Then I cloned that repository on Machine B, committed some additional changes and uploaded them to the same remote repository. In both cases, I uploaded the changes with the same command: hg push https...

Empty repository after subversion -> mercurial conversion

I've used the 'hg convert' command to try to move my SVN repository to hg, and it seems to work (takes a while and prints out all the commit messages as it goes), but at the end the resulting Mercurial directory is empty. It has the .hg hidden subdirectory in it, and it's about 200 MB so SOMETHING happened, but none of the files are the...

Find commits less than N characters to help spot lazy developers

Is it possible in any of the modern SCMs to grab a complete list of commits, their revision numbers and the user that did it, when given a specific character count? I'd like to find out which -- if any -- of the developers are letting the side down with useless commits. Disclamer: I understand that short commit messages can sometimes a...

Local commits pushing to a central server

Hello, At work we use perforce and are encouraged to make regular commits to it (something I am fine with). However, I'd like to run something like mercurial so I can locally commit stuff that is work in progress and doesn't necessarily compile/run and then from this do my regular commits to the central perforce server. My question her...

Pushing to remote repository after merge "creates new remote heads" - is that bad?

I initialized a Mercurial project on Machine A, committed my changes and uploaded them to a remote repository. Then I cloned that repository on Machine B, committed some additional changes and uploaded them to the same remote repository. In both cases, I uploaded the changes with the same command: hg push https://username:password@do...

Git and Mercurial - Compare and Contrast

For a while now I've been using subversion for my personal projects. More and more I keep hearing great things about Git and Mercurial, and DVCS in general. I'd like to give the whole DVCS thing a whirl, but I'm not too familiar with either option. What are some of the differences between Mercurial and Git? Note that I'm not trying t...

Is there a single server I can use to store/manage version control for SVN/Git/Hg/etc?

Is there a single server I can use to store/manage repositories which could then be accessed by the common/modern open-source (D)VCSs such as SVN, Git, Mercurial, bzr, etc and still keep a good level of compatibility with all of them? We have a large number of users on SVN, some on Git, and a couple using mercurial but none are using an...

Why does mercurial "hg log --style paper" give me "permission denied" error?

hg log works. hg log --style does not work. C:\temp\myhg>"c:\program files\mercurial\hg" log changeset: 0:9c62e300d833 user: Administrator@biostar date: Wed Oct 21 04:57:41 2009 -0500 summary: 124 my first commit C:\temp\myhg>"c:\program files\mercurial\hg" log --style paper abort: Permission denied: c:\program ...

How does Mercurial handle splitted files?

How does mercurial handle splitted files? What will happen if I create a branch and split a file. Can I easily pull changes from another branch which modifies the original, unsplitted file? ...

mercurial (hg) syntax equivalent of git's "^", meaning the commit PRIOR to the specified commit.

In git, for a given commit X, X^ means the commit prior to X. Is there an hg equivalent? ...

View Mercurial log/status with less by default

Hi, Is there a way to make mercurial use less to show me the logs/diffs/whatever by default? Now mercurial just displays everything when I type 'hg log'. I suppose I can use aliases like 'hg log = less hg log' if I want to. I'm wondering if there're better solutions. ...

How do I know if a branch has already been merged in SVN/Mercurial/Git?

Is there any way of easily deciphering (i.e. at a glance) whether or not a branch has already previously been merged with the another branch or the trunk? The nearest I've been able to figure out is by looking at the commit notes and displaying the merged commit notes. The disadvantage with this seems to be that unless you know which b...

Using 'gitweb' style shows all branches. Can I show only desired number of branches?

Hi, When Using 'gitweb' style for hgweb on a page I can see planty of branches, for example if I have 1000 of them - all are shown. I tried setting: [defaults] branches = -a in global hgrc file but it doesn't effect the web view. My guess is it is related to 'gitweb' style template's files. Is there any easy way of limitating the num...

Can Mercurial merge a named-branch that isn't a head?

Basically, I have dev branch, and what I like to do is to create a feature branch while I implement something, and then merge it back. So situations like the following occurs a b c d - dev / e f - feature Since dev isn't a head, is it still possible to bring dev up to feature such that both dev and feature are pointing to f? I'm...

Stand-alone Mercurial (or other SCM) client for user without administrator rights?

I don't have admin rights to my pc, but would like to use Mercurial (a different SCM is fine, too) to track changes. I have Mercurial installed, but can't install TortoiseHg because I don't have admin rights. Is there an alternative that doesn't require (either directly or through dependencies) admin rights? P.S. I'm looking for a stand...