3 ms·
He explains it more in the linked "HgInit" tutorial. An excerpt: Mercurial actually has a whole lot more information: it knows what each of us changed and can
by DennisP 17y ago
He explains it more in the linked "HgInit" tutorial. An excerpt:
Mercurial actually has a whole lot more information: it knows what each of us changed and can reapply those changes, rather than just looking at the final product and trying to guess how to put it together.
For example, if I change a function a little bit, and then move it somewhere else, Subversion doesn’t really remember those steps, so when it comes time to merge, it might think that a new function just showed up out of the blue. Whereas Mercurial will remember those things separately: function changed, function moved, which means that if you also changed that function a little bit, it is much more likely that Mercurial will successfully merge our changes.
- nas 17y agoYet git doesn't remember those things either and can still merge as well as hg (arguably better in some rename cases). What was his point again?
- statictype 17y agoI thought his point was quite clear: Mercurial (and distributed vcs in general) make it easier to merge changes than svn.