Mon, 24 May 2010 23:33:12 +0300, /Stanimir Stamenkov/:
Mon, 24 May 2010 15:02:31 -0500, /Peng Yu/:
Does svn offer all the capability that gits offer in terms of
branching and merging (ignoring performance issues)?
<http://stackoverflow.com/questions/2475831/merging-hg-git-vs-svn/2477089#2477089>:
... from the release notes for Subversion 1.5: Merge tracking
(foundational) it looks like there are the following differences from
how merge tracking work in full-DAG version control systems like Git
or Mercurial.
(...)
May be this one worth citing in here, too (if it is relevant to your
development):
* In "Known Issues" there is warning that merge tracking migh not
work with file renames, e.g. when one side renames file (and perhaps
modifies it), and second side modifies file without renaming (under
old name).
Both Git and Mercurial handle such case just fine in practice:
Git using rename detection, Mercurial using rename tracking.
--
Stanimir
