I'm inclined to vote +1 for a move to git. JP and I seem to collaborate just fine using github for EclipseFP and scion, FWIW. I tend to develop on ad hoc branches before I merge changes back onto the master branch.<br>
<br>I can't say that either of us have run into significant problems, although I did hose myself once merging some of JP's changes onto my branch. Not a big deal, since one will run into those problems from time to time.<br>
<br>Win32/64: Current msysgit hasn't caused me any significant pain. I'm not entirely focused on performance, just getting latest patch sets from the github repo.<br><br>Since it's just the two of us working on separate forks, I'm not sure that either of us are pushing git to its limits. I suspect that if there are multiple branches being developed, merging code from multiple branches into your branch will be tough. Not sure that any VCS will help you there.<br>
<br>Where things will get really nasty is merging later changes to the scion-server code back with nominolo's latest "mega patch". This is where theory of patches or any VCS theory will just break, since the changes are substantial. I'm not sure any VCS or DVCS will ever solve the problem of major divergence.<br>
<br><br>-scooter<br><br><div class="gmail_quote">On Mon, Jan 10, 2011 at 3:19 AM, Simon Marlow <span dir="ltr"><<a href="mailto:marlowsd@gmail.com">marlowsd@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
It's time to consider again whether we should migrate GHC development from darcs to (probably) git.<br>
<br>