Git doesn’t track renames at all, but uses heuristic to re-discover them during merge etc. Mercurial tracks renames (the origin version and origin file is recorded) and uses that information during merges. So you have to explicitly tell hg about renames with hg mv, or use hg addremove –similarity for auto-discovery. There has been some … Read more
There’s nothing in particular in DVCSs that makes merging easier. It’s simply cultural: a DVCS wouldn’t work at all if merging were hard, so DVCS developers invest a lot of time and effort into making merging easy. CVCS users OTOH are used to crappy merging, so there’s no incentive for the developers to make it … Read more
If you are using TortoiseHg 1.x for Windows, this feature is implemented beautifully right out of the box (no extensions required). Run the TortoiseHg Commit Tool. Choose a file for which you only want to commit a subset of its changes. Click on the Hunk Selection tab in the preview pane. Double-click or use the … Read more
Graft uses Mercurial internal merging, while transplant relies on patch mechanism. Therefore graft should be able to handle three-way-merges better than transplant currently does.
The new things are related to MSTest stuff. This is the one that I use: # use glob syntax syntax: glob *.obj *.pdb *.user *.aps *.pch *.vspscc *.vssscc *_i.c *_p.c *.ncb *.suo *.tlb *.tlh *.bak *.[Cc]ache *.ilk *.log *.lib *.sbr *.scc *.DotSettings [Bb]in [Dd]ebug*/** obj/ [Rr]elease*/** _ReSharper*/** NDependOut/** packages/** [Tt]humbs.db [Tt]est[Rr]esult* [Bb]uild[Ll]og.* *.[Pp]ublish.xml *.resharper *.ncrunch* … Read more
Yes, you can do this using mercurial without any extensions by Concatenating Changesets. Alternately if you want to use an extension you could use: The Collapse Extension The Rebase Extension or The Histedit Extension
Update to the stiging branch and create a new branch off of it. Then close the old branch. In summary: hg update stiging hg branch staging hg commit -m”Changing stiging branch to staging.” hg update stiging hg commit –close-branch -m”This was a typo; use staging instead.” hg push –new-branch
When “waiting for lock on repository”, delete the repository file: .hg/wlock (or it may be in .hg/store/lock) When deleting the lock file, you must make sure nothing else is accessing the repository. (If the lock is a string of zeros or blank, this is almost certainly true).
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
Using git-hg. First, make sure there is a (non-Mercurial) git submodule under your main repository. If you don’t have other submodules yet, just create a dummy submodule for some library other than core-plot, for instance: main-repo $ git submodule add https://repo.url.com/repo.git repo Second, clone the core-plot library into some directory. main-repo $ git-hg clone https://code.google.com/p/core-plot/ … Read more