mercurial

Mercurial How To Merge 2 Repositories that share a common ancestor but are not clones of the same repo

I am using hg-subversion, and I have 2 different hg repositories one from our svn trunk, and one from a branch of the trunk. I would like to link them somehow. At some point in the history both Hg repositories will be identical is there some way to join them? In other words is there a way to relate the repositories from within Hg? The...

Is using distributed source control like Mercurial worthwhile for a team of one?

I currently use Subversion for my one-person software company. Is it worthwhile moving to Hg (Mercurial)? Or are the benefits only realisable with a multiperson team? ...

mercurial support in CruiseControl.NET - how to clean & update build folder?

I'm using the Mercurial source control block in CruiseControl.NET, and I have it set to autoGetSource but some of the files (such as version number, based on current time) change as part of the build. So for the next build, some of the files are changed so autoGetSource fails. Is there a way I can tell CruiseControl.NET to do a hg updat...

How do you access the commit message in a Mercurial in-process hook?

I've been trying def debug_hook(ui, repo, **kwargs): changectx = repo[None] ui.status('change.desc: %s\n' % changectx.description()) return True But it always prints an empty string. Is this because it is a precommit hook and the message isn't available yet? Or am I just missing something obvious? ...

Mercurial Editor: "abort: The system cannot find the file specified"

I have a problem getting Mercurial to recognise my editor. I have a file, c:\windows\notepad.exe and typing "notepad" at the command prompt works. I can commit by using the "-m" argument to supply the commit title. But a simple "hg commit" brings up the error. A call to "hg --traceback commit" brings up: Traceback (most recent call las...

Anyone use both Tortoise Git and Subversion on the same machine?

Anyone install both? Using each for separate projects obviously. Shouldn't be a problem, I'm guessing, but hoping to fish out any gotchas. Furthermore, anyone use Tortoise Git, Subversion and Mercurial on the same machine? Edit: Forgot to mention, this is for Windows 7. ...

Get visual diff of two revisions of a file.

I'd like to know the best/easiest way to get a visual diff of a file given 2 revisions in Mercurial. ie: I'd like to visualize the difference between revision 3 and revision 12, etc. ...

Mercurial and Word or PDF documents

Hi, is it possible to use Mercurial version control to track Word or PDF files? Is there any limitation or problem? THANKS! ...

Changing Name Associated With Past Commits In Mercurial

A friend recently had the occasion for a legal name change, which made me wonder about how to cope with that in a development environment, especially in regards to source control. Their legal name changed, so naturally their login name and associated identity stuff changed. If they were a team member of mine, I'd like to change the r...

Mercurial Queues: combining patches

I've been playing with Mercurial and mercurial queues, and now have a fairly reasonable working version. However, before I submit a patch, I'd like to take that spagetti-history and merge it into discrete, logical steps, rather than the semi-overlapping repeated do-undo-redo-slightly-differently mess it is now, if only to reduce the num...

How and/or why is merging in Git better than in SVN?

I've heard a few places that one of the main ways distributed version control systems shine, is much better merging than traditional tools like SVN. Is this actually due to inherent differences in how the two systems work, or do specific DVCS implementations like Git/Mercurial just have cleverer merging algorithms than SVN? ...

Source Control - Distributed Systems vs. Non Distributed - What's the difference?

I just read Spolsky's last piece about Distributed vs. Non-Distributed version control systems http://www.joelonsoftware.com/items/2010/03/17.html. What's the difference between the two? Our company uses TFS. What camp does this fall in? ...

Host Mercurial on my company's intranet?

Instead of using an external web-based Mercurial host, I want to set one up on my company's intranet. Is there a web-based tool for Mercurial that lets you have an interface like Bitbucket's but let's you host Mercurial locally? ...

Mercurial local branching and pushing to shared repository

I created a branch on my local Mercurial repository. I want to push to the shared repository so my work can be backed up, but I don't want other project members to see the branch. What's the standard operating procedure in this case? I'd like to avoid having the repository get full of developer branches that I don't need to see. ...

Pulling and pushing between two google code repositories

I'll start by quoting google's blog Project owners can now create multiple repositories for their project, and they can choose to make any of those new repositories a clone of any of the project's other repositories. These project clones share the same commit access permissions as the original project and make it easier for project m...

One repository/multiple projects without getting mixed up?

Hello After reading Joel's last article on Mercurial, I'm giving it a shot on XP as a single-user, single-computer source control system. One thing I'd like to check, though, is: It'd be easier to just create a repository of all the tiny projects I keep in eg. C:\VB.Net\, but the result is that the changes I make to the different proje...

Merging: hg/git vs. svn

I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual intervention). Could you post a few step-by-step lists of branch/modify/commit/...-operations that show where SVN would fail while Hg/Git happily move...

How do I import a mercurial patch that has a different directory structure

I have a patch, made with hg export 42 in another repository, that modifies the files asd/fgh/foo/bar.c asd/fgh/foo/fish.h boo/hoo.txt I need to import this patch to a repository that has the structure like: src/foo/bar.c src/foo/fish.h boo/hoo.txt Is there any command that can accomplish this - I can re-run the hg export on the ol...

Distributed version control for HUGE projects - is it feasible?

We're pretty happy with SVN right now, but Joel's tutorial intrigued me. So I was wondering - would it be feasible in our situation too? The thing is - our SVN repository is HUGE. The software itself has a 15 years old legacy and has survived several different source control systems already. There are over 68,000 revisions (changesets),...

Mercurial: abort: no username supplied (see "hg help config")

I have added repository and at the time of commit I get error as error: abort: no username supplied (see "hg help config"). I am not getting Mercurial.ini file on my local as well. Does anyone know how I can resolve this error on Fedora? ...