TAG | hg

Feb/12

25

svn-hg-git

Some time ago I was looking for those command equivalents:

Subversion (SVN)

Mercurial (Hg)

Git

svn add hg add git add
svn blame hg blame git blame
svn cat hg cat git show
svn checkout hg clone git clone
svn commit hg commit ; hg push git commit -a ; git push
svn delete/remove hg remove git rm
svn diff hg diff git diff, git diff –cached
svn help hg help git help
svn log hg log git log
svn revert hg revert git checkout -f
svn status hg status git status
svn update hg pull –update git pull
svn move/rename hg move/rename git mv

, , , ,

Our team has recently updated to TortoiseHg 2.0 and everybody were frustrated with the update that came with it regarding shelving. Sometimes you simply can’t unshelve your files, while keep receiving the following message “1 out of 1 hunks FAILED”:

image

Solution

If you are aware of what I am talking about here is the quick fix for you:

Add following lines

[patch]

eol = auto

into the next file

%userprofile%\mercurial.ini

Enjoy!

Why it happens?

It’s because of EOL handling problems when running mecutial under Windows, this line enables patch to fix it.

, , , ,

Find it!

Theme Design by devolux.org