[sldev] Created page on source control
Dzonatas
dzonatas at dzonux.net
Tue Jun 19 09:09:56 PDT 2007
Paul TBBle Hampson wrote:
> Having recently become enamoured of git, (and git-svn), I'd love to
>
Torvalds has recently lobbied git as ready for mainstream, but he also
noted that it doesn't have all the nice front-end features of other
SCMs. If git can be used with tools like TortiseSVN/TortiseMerge, or
anything like that, it may be worthwhile to review.
One minor difference about git is that the merge process is pushed
downstream rather than upstream like svn. The pulls are cleaner on git
since the responsibility of merge is put more on those downstream.
The major difference is that the repository has to be broken up into
git-projects unlike where everything is put together in svn, being only
delineated by directories.
Torvalds tends to compare svn to cvs in the sense of a linear
repository, which cvs is a major restriction of cvs. He doesn't seem to
make any comparison to a svn repository that is setup more to a deep
tree structure. You can easily recognized the branch level in svn. Most
svn users still have their repository setup in a linear fashion with one
branch level, being one branch directory with lots of version
directories stuck under that one branch directory. The power of git can
be still simulated in a svn-repository with the deeper tree structure,
where you have branches that spawn more branch directories and each
sub-branch level feeds into the super-branch level. At that point, git
only does it in a more distributed fashion.
--
Power to Change the Void
More information about the SLDev
mailing list