Tag: mercurial

What are is most basic set of git command you would teach first?

I’m using mercurial with bitbucket to synchronize my code between computers, there’s only me using it, I could totally use a centralized protocol like SVN, but I just like mercurial. Things are easy with mercurial, hg add/com/up/push/pull/status and I’m ready to go. I often get in trouble with merges when I forgot to pull first, […]

Git merge 2 versions no common ancestor

I have my source code in a mercurial repo, whereas the master branch has been moved from mercurial to a git repo. The current git master branch head and my mercurial version has conflicts. The git master was created as a new repo and not derived from the original mercurial repo. How can I merge […]

Specifying where Version Control repositories are stored

I’d like to use VC for development projects, however what I see in the various types (Git, SVN, Mercurial…) doesn’t seem to suit what I’d like to accomplish. What I’d like to do is have the code repositories stored on an external device (such as thumb drive or SD card), not only for version control, […]

convert old repository to mercurial

I’ve been playing around with different versioning systems to find one I’m comfortable with. I started with SVN (lets call this version of the project “f1”), then changed over to GIT. But I didn’t know how to convert the old SVN repo to GIT, so I just copied the folder, deleted the .svn stuff, and […]

Vault to Git to Mercurial not preserving dates

Using https://github.com/AndreyNikiforov/vault2git I was able to convert a Vault repo to Git and then used Mercurial’s hg convert to get a hg repo. The only issues is that after running hg convert the dates on the change set commit dates are incorrect. The dates show the time the change set was converted from got to […]

How to save disk usage when cloning git or hg repositories?

I have cloned few trees into my local disk and it takes too much space from my limited laptop disk. Unlike non-distributed version controls, such as SVN and CVS, when you checkout a git or Mercurial repository you get the whole tree, including the whole history, and since I rarely commit any code into these […]

DVCS detect code block movement

I’m looking for a version control system that is able to detect if a function is moved inside a file. For example, there is this file “Foo.java” and this contains function “a()”, “b()” and “c()”. public class Foo { void a() { } void c() { } void b() { } } Now if user […]

Specify SSH configuration for Git per-repository

In Mercurial, I can specify the command (and thus the certificate) used for SSH per-repository in .hg/hgrc, for example: [ui] … ssh = “C:\path\to\ssh.exe” -i “C:\Development\Identities\identity1.id_rsa” Most instructions I can find on configuring Git seem to use the bundled ssh.exe to manage the certificates, for example GitHub’s guide for Windows. There is a way of […]

vim colorscheme to highlight modifications since last commit?

In vim, what I want to do is to highlight all the modifications I have done since the last commit (I personally use mercurial), either using two colors, or a darker and a lighter version of the same colorscheme for the old and new contents, respectively. I don’t care about syntax highlighting coz the document […]

git with DiffMerge setup to mimic Mercurials setup with diffmerge

I’m wondering if there is a way to setup git and diffmerge so that when you execute the following command: git difftool diffmerge pops up and shows you a file listing of all the modified files instead of cycling through them via the command-line? I’m thinking it must be some setting the ~/.gitconfig file. Here […]

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