I've got a nasty feeling this is something to do with using 32-bit Python and/or 64-bit Mercurial, but I'm new to Macs and I don't fully understand the background. I'm running Django and I've got Mercurial and Python 2.6 installed (in both cases, the default versions from Macports). I've set 32-bit Python as an environment variable: ex...
As of 0.9.4, when adding a symbolic link Mercurial keeps track of the link itself, and not the file or directories it points to. However, there are cases when it is desirable to keep track of the files pointed to by the symbolic link. How can I force Mercurial to treat the symbolic link to a directory as a regular directory? ...
I have a Mercurial repository for a personal project, and I have been storing the master repository in my Dropbox for a few weeks now (something along this line; and I understand it's also possible with git). The idea is that it serves both as a way to work with multiple machines and as a remote backup. I clone the repository and work ...
I've been googling for a while now but I was surprised to be unable to find an answer to this, quite simple, question. With mercurial 1.4, when I clone a repository on a windows client, symlinks appear as a file containing the path to the original file. I don't use symlinks extensively, but I do use them for shared lib handling (libpng...
Many times I'm making two different changes to files in my repository, I want those changes to be treated as two consecutive commits. For example, in repository prog.c prog.h README.txt While fixing a bug prog.c and prog.h, I fixed a typo in README.txt. Now I want to commit the change to prog.c with its own commit message, and the c...
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort: unexpected response from CVS server ...
I'm getting an error trying to convert a git repository to mercurial. When I run: hg convert gitdir hgdir I get this: UnboundLocalError: local variable 'tz' referenced before assignment Background: I just installed TortoiseHg and enabled the convert extension. It looks like nmercurial convert is having a problem with the gi...
What are the branching characteristics of TFS? I am asking the question because I don't have experience of the tool. Let me discuss what context I am putting it in... Early Branching/Heavy Branching If we look at the tools Perforce, Subversion, CVS, for instance, we see that branching is effectively taking a copy of the trunk. i.e...
This is perhaps not a question unique to Mercurial, but that's the SCM that I've been using most lately. I work on multiple projects and tend to copy source code for libraries or utilities from a previous project to get a leg up on starting a new project. The problem comes in when I want to merge all the changes I made in my latest pro...
How do you manage common library source in a DVCS? Currently, my team uses Perforce to manage our software projects. Using Perforce's "Workspace Mapping" feature, I am able to easily map common library source into dev application directories in a way that keeps the transformation between source management and dev project work transpare...
I just made the move to version control the other day, and after a bad experience with Subversion, I switched to Mercurial, and so far am happy with it. Although I understand and appreciate the idea of version control, I don't really have any practical experience with it. Right now, I am using it for a couple websites I am working on, ...
Is there a way to configure TortoiseHg to store my password? I have a project hosted on Google Code that I access using TortoiseHg. Whenever I want to push changes to Google Code TortoiseHg prompts me for a username and password. Google Code requires me to use an auto-generated password, and it gets quite repetitive to look it up every ...
Converting from subversion, I take the opportunity to clean up the repo, and split it in three mostly independent projects. But... I have a filemap that says exclude bot include bot/aobiosbot.py Which should include everything, except the "bot" subdirectory, but still include the "aobiosbot.py" file in that directory. The trouble is...
I want to generate a list of which files changed between two revisions in a given directory in Mercurial. In particular, I am not interested in what changed, but which files changed in that directory. E.g., supposing that between then and otherthen, only 2 files changed: >hg hypothetical-command -r then:otherthen foo.baz bar.baz > W...
I am a newcomer to mercurial. I have recently set up a repository with 2 colleagues and am having difficulty with pushing my code. [I am using command-line hg in Windows]. In particular when I push I get a dialogue like the following: >hg commit -u petermr >hg push pushing to http://bitbucket.org/petermr/polyinfo/ searching for changes...
Is it possible to see a list of all tags on a remote mecurial repository, without cloning it first? In git I can run git ls-remote --tags. ...
I am familiar with SVN and TFS for source control. One issue which I usually encounter is the same file is modified for different bugs (say bugP is fixed with revision/changeset (N), bugQ is fixed with revision(N+1) and bugR is fixed in revision/changeset(N+2) Each revision/changeset work on different part of the same file and there is ...
I'm writing a little CLI in Python (as an extension to Mercurial) and would like to support tab-completion. Specifically, I would like catch tabs in the prompt and show a list of matching options (just like bash). Example: Enter section name: ext*TAB* extensions extras The problem is I'm not sure how to catch the Tab ev...
I am trying to use HG (Mercurial) with the Vim VCScommand plugin, but am running into a problem "Too many matching VCS: git HG". I removed the vcsgit.vim and the HG binding seemed to work. I thought VCScommand used the folder to determine, which VCS one was using. I guess this is a flawed assumption. ...
Hoi, I try to hg pull from my private repo on Bitbucket.org into my local repo on my Windows machine from behind the company proxy that requires Windows authentication. I found the proxy server and port (Internet options of IE) I found the settings Mercurial.ini file in my %USERPROFILE% I added this section to it (info): [http_prox...