3 ms·
Except when it breaks. And what about feature branching? I think the name "feature branch" is an implementation detail, but I really do like that Git enables me
by skrebbel 12y ago
Except when it breaks. And what about feature branching? I think the name "feature branch" is an implementation detail, but I really do like that Git enables me to "only ship features that are considered somewhat 'done'", so that I can ship often yet not ship half-finished work.
SVN and CVS make this notoriously difficult. So I need a DVCS. But those are all super complex. I think Git/Hg/etc are great innovation and obviously the step forward compared to SVN and friends, but I'm not convinced were there yet.
There has to be a way to get the major tangible advantages of Git with the ease of use of SVN.
- lelf 12y agoDarcs. Super easy and has a formal theory behind it.
- skrebbel 12y agoGood one, it actually looks really cool. I played with it last many years ago, when there was a notorious bug that occasionally, merges would take super long because the algorithm was exponential in nature. Do you know whether things have improved on that area?
- lelf 12y agoSignificantly. AFAIK there are still pathological cases where it'd take much time, but they are very rare. [And to be fair: others don't have that problem only because their merging doesn't take into account the history.]
- skrebbel 12y agoNice to hear! I'm going to give it another roll. Now that I'm picking your brain anyway, do you know if there's any (workable) way at all to combine a site like GitHub or Bitbucket with Darcs?
- ExpiredLink 12y agoMake branches the exception instead of the rule, a.k.a. 'Trunk Based Development'. Just like Google and Facebook. http://paulhammant.com/2013/04/05/what-is-trunk-based-development/ http://paulhammant.com/2013/04/05/what-is-trunk-based-develo...
- eterm 12y agoHow does svn make feature branching difficult? svn branch is a "free" operation (branching doesn't use space), svn switch means you can hop between branches easily. I can see how a dvcs is nicer to work with locally but I'd like to hear your struggles with svn.