mercurial

Is there a downside to this Mercurial workflow: named branch "dead" head?

I love the flexibility of named branches but I have some concerns about the prolifieration of heads. Even when the branch is closed, it still shows up in the heads. I have an idea for how to clean up the output from "hg heads" My question to the gurus: "What am I missing?" First off you may ask, Why might I want to totally hide the he...

How do I use hg push in Mercurial

Hi, I've spent some time converting my SVN repository to Mercurial. I've setup Mercurial under IIS7 on Win 2008 R2. I have nearly everything working. However I can not push changes back to server. $ hg push http authorization required realm: pandora user: rich password: pushing to https://pandora/dev/test searching for changes abort:...

Mercurial: copying ONE file and its history to another repository

Well, the title says it all. I'm wondering if I can copy one file and its history from one repository to another, without having to import the whole other repository. ...

Mercurial, Branch each project in a solution?

Currently, we're using Mercurial as our VCS on BitBucket. The way the project is right now, is a solution with all the code checked in with all the developers working on the "default" branch. Every morning, we create a build release and the QA have it. I'm wondering whether it makes more sense to branch each dev on his own since each d...

Unification of DVCS commands

When working on multiple (open source) projects, multiple version controll systems start to be problematic. While they share common operations, I often make mistakes by typing hg add instead git add. I remember seeing project some time ago that made access to different source control software in uniform way by providing basic commands c...

how can I develop a pitfall-test and performance-test for merging files under different source control systems?

Where I work, we've been using Subversion for years (apparently, I've not been here that long). There's some people here who'd prefer to use TFS, some who'd prefer to migrate to Mercurial and some who'd prefer to keep status quo. Other source controls (Git, others) won't fly because of poor Visual Studio integration. The biggest issue/...

Diffing only modified files in Mercurial

In Mercurial it's possible to hg status only the modified/added/removed files by doing: hg st -m hg st -a hg st -r Is it possible to obtain the same behaviour for the diff command? From the man page, it seems not. ...

Mercurial command-line "API" reference?

I'm working on a Mercurial GUI client that interacts with hg.exe through the command line (the preferred high-level API, as I understand it). However, I am having trouble determining the possible outputs of each command. I can see several outputs by simulating situations, but I was wondering if there is a complete reference of the pos...

Mercurial remove changeset, history with merges

I want to remove a changeset from history but hg export does not work for merge changesets (see http://mercurial.selenic.com/wiki/Export). Is there a way to use hg pull for a range of revisions? For example, say I want to remove revision 999 I want to be able to say: hg init NewRepo hg pull ../OldRepo -r 0:1000 hg pull ../OldRepo -r 100...

For Mercurial (Hg), why the file .hgignore cannot be ignored?

I have these in the proj/.hgignore: syntax: glob log/* *~ *.orig dump/* *.hgignore .hgignore tmp/* but for some reason, when I do an hg st or hg com, the file .hgignore still shows up to be modified or to be committed. So the .hgignore cannot be ignored? There might be particulars in my folder that my team didn't want to ignore but ...

hg pull from bitbucket using fabric

I'm trying to use fabric to deploy a Django project and I get this error when I run hg pull: [myusername.webfactional.com] run: hg pull [myusername.webfactional.com] out: remote: Warning: Permanently added the RSA host key for IP address '207.223.240.181' to the list of known hosts. [myusername.webfactional.com] out: remote: Permission ...

How to serve Mercurial repositories in the browser correctly?

Hello. I'm setting up my freelance server which will be using Mercurial for all the version controlling. Each project will have it's own folder, with it's own repository. Which I can then clone from my home computer, work computer or any other computer by going to that particular folder. I'm wanting to serve these repositories up into ...

Migrating from bazaar to mercurial?

I have a small project which I started in bazaar, as an exercise to learn bzr. I've since decided I prefer Mecurial. How might I migrate this project to Hg? ...

Mercurial undoing push to main branch

I accidentally pushed some changes to the main branch which weren't ready, so I immediately did a backout. Later I tried merging new changes from the trunk into my branch, but the merge didn't work very well. In particular, it seemed that it thought the backout meant that I wanted all of my changes undone. Fortunately, none of the files ...

Pushing without a commit in Mercurial or Git

Seems like for both Mercurial or Git, if I don't commit first, then I can't push? So if I don't commit (when not ready yet), I can't push to a remote server to back up my code? The code is in a notebook computer, being carried around, which can be somewhat fragile being carried around. ...

How to setup a Mercurial "server" that allows for authenticated push without apache?

I'm trying to propose switching from CVS and SVN to Mercurial at work. Before I do, I'd like to have any foreseeable questions answered. How can I set up a repository to allow push and authenticate users? I'm more familiar with administering SVN, and in SVN it was just a few lines like: [users] userA = passwordA userB = passwordB A...

hg convert - trying to move a directory from one repo to another

So I have a directory called 'flash'. I'd like to move it totally from an existing Mercurial repo located at ~/wdm to another existing Mercurial repo, located at ~/wdm-js. I've been told this is possible with hg convert, but I don't really know how this works. I have tried the following, but think I may have got something wrong. Having...

How do I automatically preserve deletes while performing a merge with Mercurial?

I have a repository I will call 'subset' which was cloned from another repository I will call 'full'. I deleted many files in subset using 'hg rm'. I now need to pull changes to the files remaining in subset from full, but I don't want to restore any of the files I deleted. If I do a pull followed by a merge, the merge will interacti...

Mercurial graph colors

What does it mean for different segments of the graph in the Mercurial Repository Explorer to have different colors? ...

Mercurial ignore-file for Eclipse and Android development

I have seen samples for Mercurial ignore files for Visual Studio, amongst others. I've just started playing around with Android development, and I also use this time to experimenting with Mercurial. So my question is: does anyone have a good example of a .hgignore file to use for Eclipse and Android development? For starters I've got t...