mercurial

How source control management interworking can be achieved?

While related questions have been asked before I would like to see an idea about how interoperability between two source control management (SCM) systems can be done. For example we could consider any SCM out there (Mercurial, Git, SVN, CVS, Perforce, ClearCase ...). Mainly I'm interested if ClearCase can be used along with SVN or Git/...

What makes some version control systems better at merging?

I've heard that many of the distributed VCSs (git, mercurial, etc) are better at merging than traditional ones like Subversion. What does this mean? What sort of things do they do to make merging better? Could those things be done in a traditional VCS? Bonus question: does SVN 1.5's merge-tracking level the playing field at all? ...

Mercurial: multiline commit message on the command line?

How can I specify a multiline commit message for mercurial on the command line? hg commit -m "* add foo\n* fix bar" does not work. The log shows: changeset: 13:f2c6526e5911 tag: tip date: Fri Jan 23 23:22:36 2009 +0100 files: foobar.cpp description: * add foo\n*fix bar ...

How do I convert a git repository to mercurial?

I've been developing a java application using git as source code repository. I'd like to share the project with other java developers and hg seems to be most used by them. My question is how do I convert a git repository to hg? If I tried googling "convert git to hg" and every search hit is about converting from git to hg. I'm also us...

Mercurial and a sort of Continuous Integration workflow for Java project

There is a project in Java where I work. To have the project in Mercurial I know that I have to make a repository for all the classes. As there is a lot of classes I think if maybe I can have a copy of a jar made of a copy of the repository plus the modifications I have to do. So in Mercurial terms there is: A main repo with all the...

Is it worth the effort to create pretty revision history in a DVCS?

I used to go back and edit my Mercurial commits to try to create a pretty history. I might have put two unrelated things into one commit, or I might have made several commits that were better understood as a single commit, but eventually it seemed like a waste of time and I got over the minor embarrassment of having less than perfect his...

What are your experiences using the new "hg rebase" command?

How has "hg rebase" treated you so far? Have you discovered any bugs or gotchas? In what situations does it replace or complement mq? ...

Is clone the only way to get contents of a Mercurial repository?

I am trying to get the sources for Netbeans IDE by running: hg clone http://hg.netbeans.org/main/ However, this seems to be taking forever, and it does not give me any kind of status which tells me the percent of download that's complete. If a lose my internet connection, I have to start all over again. I realize that Mercurial is a d...

How can I configure Mercurial to use WinMerge for merges, under cygwin?

When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn WinMerge to resolve merge conflicts. How can I do this? ...

What arguments can be made to a client/boss for SUN Teamware -> modern SCM migration?

The team where I work still uses SUN Teamware for Source Code Management (SCM). I've worked with it for a while now (over 10 months) and I don't have any particular complaints about it. Teamware has been used to manage Sun’s largest source trees, including those for the Solaris operating system and the Java system, and it works pretty w...

How to export revision history from mercurial or git to cvs?

I'm going to be working with other people on code from a project that uses cvs. We want to use a distributed vcs to make our work and when we finish or maybe every once in a while we want to commit our code and all of our revision history to cvs. We don't have write access to the project's cvs repo so we can't commit very frequently. Wha...

TortoiseHG and TortoiseSVN play well together?

I had TSVN installed first and been using for a long time. Then I install T-HG and when I right click I dont see any TortoiseHG. Does anyone have this same problem? All the T-SVN overlays are still there. ...

Mercurial: how do I change commit time (not pushed yet)?

How can I change the time I've made a commit in my local repository? Suppose I've done several commits and noticed that the date on my computer is wrong. These commits were not pushed anywhere yet, so I want to fix the time. ...

What Mercurial DVCS hosting would you recommend for a small open source project?

I'm looking around for free Mercurial hosting for a small-scale open-source project. If you've ever used such a service, who is doing the hosting, and would you recommend them? I know SF.net can be set up to host HG repos, but it looks like a lot of trouble (for the benefit of having a big, known, service that's unlikely to go down anyt...

Using Mercurial to separate private and public version

How would you use Mercurial for the following problem. Suppose I have a library Core. I now want to develop an extension to that library called Extension. I want to keep Core physically separate from Extension, i.e. let's say that Core is an open source library and Extension is a private library that builds on Core (maybe it contains so...

Continuous Integration stack on Windows with Mercurial + Mercurial Queues?

We've been using Mercurial with Mercurial Queues (+guards for patches) for source control of a number of Windows ASP.Net projects. I'm interested in setting up a Continuous Integration environment for this but am getting lost in conflicting reports of success with CC/Trac etc. I'm wondering who else out there is doing this and what...

What are your coolest/most unusual hacks using a distributed version control system?

I have been working with git for a few months and I find that most of the things that have transformed my everyday work for the better can be attributed to the flexibility and lack of enforced default policy in a distributed VCS. Quite a few people seem to have felt the same way and have built upon this kind of flexibility I have read...

What is the best source control system? What will be the most popular in the future?

Now SVN most popular. What about future? Now I am ready to migrate all my sources to ANY source control I am thinking about Mercurial. Is it good choose? Any suggestions are welcome ...

How to edit incorrect commit message in Mercurial?

I am currently using TortoiseHg (Mercurial) and accidentally committed an incorrect commit message. How do I go about editing this commit message in the repository? ...

How do I get Mercurial's hgwebdir working on Windows?

These are the steps I took: install apache 2.2.x install TortoiseHg 0.7 copy hgwebdir.cgi, hgweb.config to cgi-bin edit hgweb.config as appropriate unzip $blah\TortoiseHg\library.zip to unzip $blah\TortoiseHg\library sys.path.append("$blah\TortoiseHg\library") at the beginning of hgwebdir.cgi move $blah\TortoiseHg\templates to $blah\To...