I'm using Mercurial in a recent project. On the web server where I'm deploying the project I have a slightly different config file with production settings. The problem is when I pull and update, I often have to merge and commit as well. Is this the correct workflow? It seems strange that in order to be able to continue to update I h...
I followed the following steps to install TortoiseHG on Ubuntu 9.10 using the following document: http://bitbucket.org/tortoisehg/stable/wiki/nautilus I get the following error in my ~/.xsession-errors evolution-alarm-notify-Message: Tue Dec 1 23:28:26 2009 sys:1: GtkWarning: Refusing to add non-unique action 'HgNautilus::00None' ...
I would like to know if mercurial provides any in built BUILD tool for building/packaging the source code. ...
I was looking at my version of Mecurial and I don't understand how it is that it can be Copyrighted and Free software at the same time. Mercurial Distributed SCM (version 1.3.1+7cea12e70129) Copyright (C) 2005-2009 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warran...
There are similar questions here and here, however they are not the same, as they are asking about using mercurial and subversion together in a general sense. Reading through the Mercurial and Subversion page, there are four options, hgsubversion, mq, convert and hgsvn. hgsubversion and convert both require a full local copy of the repo...
I want to run JSLint before a commit into either a Mercurial or Git repo is done. I want this as an automatic step that is set up instead of relying on the developer (mainly me) remembering to run JSLint before-hand. I normally run JSLint while developing, but want to specify a contract on JS files that they pass JSLint before being com...
I use an ant file to build a java project in mercurial through hudson. The mailnine has a hudson job running just fine. Recently a new branch was created and pushed to the server by commnd line: hg branch newbranch hg commit hg push -f The mainine does not contain these changes and still builds fine. I have set up a new job with the sa...
The development group I'm currently in uses Visual Source Safe for our version control; this choice was originally made due to cost and it's tight integration with Visual Studio. As our repository has grown Source Safe is really starting to show it's limitations and we are considering moving to another solution. Up for discussion prima...
Is Python generally slower on Windows vs. a *nix machine? Python seems to blaze on my Mac OS X machine whereas it seems to run slower on my Window's Vista machine. The machines are similar in processing power and the vista machine has 1GBs more memory. I particularly notice this in Mercurial but I figure this may simply be how Mercuri...
I would like to convert a remote Perforce repository into a Mercurial repository on Linux. So I have installed Python and Mercurial on a Linux box. Then I test few hg (Mercurial's drive program) commands. All are working fine. Now without creating any hg repository on the Linux box I want to run hg convert on Linux, so that a Mercurial...
I did the hg convert on remote perforce repository and created a Mercurial repository on my Linux box. I can see there is nothing in my working directory, all files resided under the .hg/ folder. How can I make my work directory to start working on these files? I tried hg update to get all files on root level to become working dir, but...
I'm trying to develop a workflow which allows us to maintain seperate Visual studio 2005 and 2008 versions of a library, while making sure that changes to one branch are always replicated in the other branch. At the moment, I recommend that changes are only ever made to the default (VS2005) branch and then once complete, merged into the...
Hello, When trying to launch Mercurial(hg) after a restart in my Ubuntu 9.10 Linux Box I got following message: abort: couldn't find mercurial libraries in [/usr/bin /usr/local/lib/python2.6/dist-packages/vipy-0.4-py2.6.egg /usr/local/lib/python2.6/dist-packages/nose-0.11.1-py2.6.egg /usr/local/lib/python2.6/dist-packages/rope-0....
We're bringing some of our web development in-house and one of my goals is to get it under version control. Right now I'm looking mostly towards HG and Git, respectively. Bazaar was knocked out of the running due to some flaky behavior. The biggest points on my mind are: Access to our web host is FTP-only. This worries me a bit. The p...
How do I get a non-versioned copy of an older version of a file from a mercurial repository? Edit: I have changed somefile.png (binary file) in my local copy. I am looking for a command which will allow me to get an earlier version of somefile.png so that I can compare it with my modified copy (using an image viewer) before I commit cha...
I'd like to keep two ~/.hgrc files: ~/.hgrc and ~/.hgrc.local – one with "standard" settings (eg, username), the other with machine-specific settings (eg, setting a graphical merge tool). How can I do this with hg? For example, this is how I do it with Vim: # ~/.vimrc syntax enable source ~/.vimrc.local Then: # ~/.vimrc.local let w...
I've been dabbling with hg / mercurial lately, namely in conjunction with Fogcreek's Kiln, and I'm trying to figure out what the must-have extensions are. Its a little tricky sifting through their extension list because I'm not interested in testing any buggy or impractical extensions, even if their description sounds awesome. So, whic...
I have a personal Mercurial repository tracking some changes I am working on. I'd like to share these changes with a collaborator, however they don't have/can't get Mercurial, so I need to send the entire file set and the collaborator will merge on their end. I am looking for a way to extract the "tip" version of the subset of files th...
Hi, TortoiseHg web server configuration has an "Allow Push" parameter where I put the users allowed to push changes. But when I try to push I get an "authorization failed" error. How are the users authenticated? Where do the passwords come from? ...
We use bundles to synchronize our mercurial repositories over email. For the past few hundred revisions, we've noticed the bundle size is typically around 600k, no matter what we include. It appears that Mercurial is including revisions other than what we're specifying. I theorized that it was from open branches, but closing all of our ...