Hi, On Thu, 2011-02-24 at 13:43 -0600, Carsten Neumann wrote: > Hello all, > > On 02/24/2011 09:57 AM, Dirk Reiners wrote: > > On 02/24/2011 05:18 AM, Timm Drevensek wrote: > >> So the CVS& GIT content is currently diverging by the begin of February. > > > > Yes. The git was just a snapshot to give access while SF cleans up their > > mess, > > there is no live link between CVS and git. > > locally I have the same patches in my CVS checkout, I can commit them > (split to mirror the git commits of course) - just wanted to make sure > there is no smarter way to do this than "by hand" (which is not a big > deal for the 7 patches in this case).
It should not, if the cvs on sf is back and will work for a while (does anybody know for how long) I do not see the need to keep the git mirror around for longer, so I will push the changes back to sf and remove it. And if it is back for good, do we really want to move 1.x to a different scm. At least I would like to avoid having 1 and 2 as different branches in the same repository if there is no technical element that forces us to do so. > >> We > >> don't have any experience with git so far but it would be a good point to > >> start with dcvs's, since there are tools like smartgit or tortoisegit for > >> windows. > > > > Yup. And I would be very interested in experiences anybody has with git on > > Windows. > > I've only used it a tiny bit, worked fine for that. It does give you > bash on windows (from mingw) which by itself justifies the installation ;) I still use cygwin so no experience with 'native' window tools. We had some students use it and the only thing I encountered was to force it to respect and keep the newlines, but there is a config switch for .git/config somewhere. > >> I goggled around and found out, that there are many possibility's with git > >> like mirroring of svn etc. > >> (http://blog.tfnico.com/2010/11/git-svn-mirror-for-multiple-branches.html) > >> There is also Mercurial (HG) with Bitbucket and ongoing comparisations like > >> "Git is Wesley Snipes, Mercurial is Denzel Washington and SVN is Morgan > >> Freeman" It sounds more like a religious war between HG& GIT...but it > >> seems > >> to be, that git offers more features?! > > > > There is a religious war out, but I don't think it concerns us much. For the > > things we do IMHO either one would be fine. > > agreed. Perhaps the only relevant factor is that the popularity of git > (in terms of # projects/developers using it) seems to be far greater > than for any other dvcs, there should be good support for it in the long > run and if the next great idea for vcs hits there is going to be a > git2XYZ tool to do the conversion ;) > > > The main difference I can see is > > that hg keeps the history sacred while git allows you change it to keep it > > clean. Given that I'm expecting to use SF as an official git with tightly > > controlled write access I don't think we will have to mess with the history > > a > > whole lot, development will not be done on that tree, so I don't see a > > problem > > here. The main advantage is that there people on the team that have > > experience > > with git. IMHO we don't have to open the 'which dvcs' discussion, at least not starting from the 'oh look there are others' level. If there is a compelling technical reason to look into this fine, but otherwise I would stick with git. Workflow is a different story. As said I prefer a linear stable history so I prefer to rebase/cherry-pick my branches back to head and commit them from there as linear continuations. Merging with the detours staying visible is not my taste (yet) kind regards gerrit ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ Opensg-core mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensg-core
