Phil Endecott schrieb: > Denis Oliver Kropp wrote: >>>> I like distributed repositories. At the moment I'm having >>>> different CVS repositories for different projects, each >>>> having its own DirectFB module. Merging between them is >>>> always done manually with cvs diff and patch etc. >>>> >>>> How would svn solve that? >>> >>> The answer is "with svn:externals". Although I use subversion I do >>> understand that there are situations where git is more suitable. The >>> obvious case is when you have large numbers of developers working >>> very independently. I don't know if that applies to you. But in the >>> case that you describe, I have to ask, why does each of your projects >>> have its own copy of DirectFB? Personally, I would have a single svn >>> repository for DirectFB. Then in each of the other projects, use an >>> svn:externals "symlink" to point to it. When you check out the >>> project, you'll get a copy of DirectFB automatically. >> >> Is it possible to commit to the local copy and have your local history? >> >> How would you merge back your changes to the mainline? > > If you really want to have separate history for each project's version > of DirectFB, then you need to have multiple branches in the DirectFB > repository. Each project's external points to its own branch of > DirectFB. Then commits go into the branches. To merge a branch into > the trunk, in a checkout of the DirectFB trunk you merge in the changes > from the branch and then commit.
But commits to the branch still require a connection to the server and don't go to the local disc, do they? > I have a similar situation with a library of utility functions that is > shared between a handful of projects. I have embedded the library into > the projects using externals. I have not found it necessary to have > multiple branches of the library, though at any point in time each > project may have a different version of it checked out, because > development on it is linear rather than branch/merge. > > Again, I don't really know much about what you need to do and maybe git > is best. But I thought I ought to point out another option. -- Best regards, Denis Oliver Kropp .------------------------------------------. | DirectFB - Hardware accelerated graphics | | http://www.directfb.org/ | "------------------------------------------" _______________________________________________ directfb-dev mailing list [email protected] http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
