Tag: mercurial

Can I use a git repo for a subfolder in a mercurial repo?

I have a mercurial repo in code.google that includes folders like H |_ A |_ B |_ C The top-level folder H contains sub-folders A, B and C. Now, I wanted to use Heroku to test the webserver in B, and Heroku only supports git. Since the testing is temporal, so I do not want […]

Mercurial vs Git in IntelliJ IDEA

Regarding IntelliJ IDEA 12 (or the new 13 Beta, but please specify which), which integration is better, the one with GIT or the one with Mercurial, and why?

Using hg convert to convert git repo to old svn format

According to the following post: http://davidvg.com/2011/12/07/converting-a-git-repo-to-svn a git repo can be converted to an svn repo using hg convert. This works for me, however, the resulting svn repo is to modern for me. The db/format number for the resulting svn repo is 6 (svn 1.8+). I need it to be 4 (1.6+), an older version […]

Is Subversion better at cherry-picking then git (or any DAG VCS)?

I just read http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html and seems that svn:mergeinfo can track info about single commit merge which happen at cherry-picking. That avoid merge conflict when you merge back your feature-branch with cherry-picked bug-fixes to original branch (where you made bug-fixes before). Here funny ASCII art (which people like at SO): o–o–o–o–o feature ^ ^ \ / […]

Default remote mercurial repository in Netbeans

Every time I want to push my changes to remote mercurial repository, Netbeans prompts the Push Dialog and asks for repository path, username and password. Is there any way I can save these things as default so I can push without being prompted? Not to mention, I have already set HG properties but it still […]

Is there a synopsis about how to do certain things with different scm tools?

I’m quite familiar with Subversion, and I use Mercurial and Git as well. Mercurial looks like a friendly tool to me, as it’s commandline interface is easy to use for Subversion users; but Git doesn’t. Is there a comparison sheet somewhere, which e.g. allows to see at a glance how to revert local changes for […]

Identify a URL as referring to a git or hg repository

I’m developing a build tool which can import dependencies from various other locations. I want to support importing svn, git, and mercurial repositories by specifying the URL for the repository. Ideally, I want to be able to automatically identify what kind of repository an URL refers to by inspecting the response from the server. For […]

Use hg commands to operate git and hg simultaneously

I have a mercurial repository and a git repository. Both are using the same code and same change-sets. When I make any changes to my hg repository, commit it and push it to hg repository, the same changes should get pushed to the git repository also. Is this possible? How?

Git equivalent of Mercurial phases?

In mercurial, I regularly use secret changesets to track my work on stuff that isn’t quite ready to push yet. Then, if I need to make an emergency change to some file, I can update to the public revision, make that change and push it, without having to worry about my unfinished changesets getting pushed. […]

Which version control software allows to whitelist dirs?

I want to whitelist a couple of directories and a file: /app /config /db Gemfile A go-to version control, git, does not allow to track a directory: # .gitignore: * # ignore all: suppose I prefer whitelisting # but not the following things: !/app/* !/config/* !/db/* !Gemfile Doesn’t work: git only sees Gemfile. Do you […]

Git Baby is a git and github fan, let's start git clone.