Stories
Slash Boxes
Comments

News for nerds, stuff that matters

Slashdot Log In

Log In

Create Account  |  Retrieve Password

FreeBSD Begins Switch to Subversion

Posted by timothy on Wed Jun 04, 2008 02:10 PM
from the subvert-the-dominant-paradigm dept.
An anonymous reader writes "The FreeBSD Project has begun the switch of its source code management system from CVS to Subversion. At this point in time, FreeBSD's developers are making changes to the base system in the Subversion repository. We have a replication system in place that exports our work to the legacy CVS tree on a continuous basis. People who are using our extensive CVS based distribution network (including anoncvs, CVSup, cvsweb, ftp) will not be interrupted by our work-in-progress. We are committed to maintaining the existing CVS based distribution system for at least the support lifetime of all existing 'stable' branches. Security and errata patches will continue to be made available in their usual CVS locations."
+ -
story

Related Stories

[+] Technology: The Future of Subversion 173 comments
sciurus0 writes "As the open source version control system Subversion nears its 1.5 release, one of its developers asks, what is the project's future? On the one hand, the number of public Subversion DAV servers is still growing quadratically. On the other hand, open source developers are increasingly switching to distributed version control systems like Git and Mercurial. Is there still a need for centralized version control in some environments, or is Linus Torvalds right that all who use it are 'ugly and stupid'?" The comments on the blog post have high S/N.
This discussion has been archived. No new comments can be posted.
The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.
 Full
 Abbreviated
 Hidden
More
Loading... please wait.
  • GIT? (Score:5, Interesting)

    by liquidpele (663430) on Wednesday June 04 2008, @02:17PM (#23656199) Homepage Journal
    Wonder why they went with subversion over GIT?
    • Re:GIT? (Score:5, Informative)

      by bark (582535) on Wednesday June 04 2008, @02:23PM (#23656295)
      They don't use git because FreeBSD development has traditionally been "centralized". They use a model where patches are fed to a group of core developers with "commit permission" to the tree, and all source changes are vetted and fed through that funnel. Subversion's centralized source control methodology works well with the FreeBSD development process, and the decentralized aspects of git is not needed.

      However, of course, there is still some distributed coding going on at the edges, but they tend to be peripheral and experimental. The developers working on these experimental branches can choose to use whatever source control system they wish. Many FreeBSD developers prefer perforce for their experimental work, but they can use git or mercurial if they wish.
    • Re:GIT? (Score:5, Informative)

      by LurkerXXX (667952) on Wednesday June 04 2008, @02:25PM (#23656337)
      Subversion has an Apache/BSD type license. GIT does not.
    • Re:GIT? (Score:4, Interesting)

      by AKAImBatman (238306) <akaimbatman@ g m a i l . com> on Wednesday June 04 2008, @02:29PM (#23656435) Homepage Journal
      GIT lost the version control war early on. Its focus on Linux development with little to no support for Windows and Mac made it unpopular. That's a situation that has changed (somewhat), but the stigma is still attached to it. Which is not really a problem. GIT was developed to meet the needs of the Linux Kernel Project. If it happens to meet the needs of other projects, great. If it doesn't, that's just as fine.

      In any case, Mercurial [wikipedia.org] ended up being the "best of breed" solution. It offered all the features of the competing version control systems, was portable across platforms, had a significant toolchain appear practically overnight, and is used by HUGE OSS companies like Sun and Mozilla. I've used it in my own projects and have found that it is much easier and more dynamic than the classic, monolithic model of CVS.
      • Oh really? (Score:5, Funny)

        by krog (25663) on Wednesday June 04 2008, @02:32PM (#23656477) Homepage
        Thanks for promptly settling the SCM dispute! Now I'd love to hear your ideas on which text editor is the best.
        • by 0xABADC0DA (867955) on Wednesday June 04 2008, @03:16PM (#23657203)
          VI lost the editor war early on. Its focus on text files with little to no support for email or shell prompts or playing text-mode hangman made it unpopular. That's a situation that has changed (somewhat), but the stigma is still attached to it. Which is not really a problem. VI was developed to meet the needs of text editing. If it happens to meet the needs of other activities, great. If it doesn't, that's just as fine.

          In any case, EMACS ended up being the "best of breed" solution. It offered all the features of the competing editors, was portable across platforms, had a significant tools (and games) appear practically overnight, and is used by HUGE OSS icons like RMS. I've used it in my own projects and have found that it is much easier and more dynamic than the classic, command/insert model of VI.

          har, har...
      • Re: (Score:3, Interesting)

        GIT lost the version control war early on. Its focus on Linux development with little to no support for Windows and Mac made it unpopular. That's a situation that has changed (somewhat), but the stigma is still attached to it. Which is not really a problem. GIT was developed to meet the needs of the Linux Kernel Project. If it happens to meet the needs of other projects, great. If it doesn't, that's just as fine.

        Huh? Git didn't have windows support very early on but very soon you could compile it with Cygwi

    • Re:GIT? (Score:5, Informative)

      by Fweeky (41046) on Wednesday June 04 2008, @02:32PM (#23656475) Homepage
      Path of least resistance; it works much like CVS, it fits in with existing infrastructure, and everyone knows how to use it.

      git isn't terribly well suited to very large monolithic projects; you need to split into multiple smaller projects since it tracks entire trees rather than single files. When your tree is 1.3GB+ and has upwards of quarter of a million files that's rather painful either way.

      It also isn't well suited to rewriting history, e.g. in the case when you have to remove a changeset because it violates someone's patent or copyright; you can rewrite the repository to remove it, but you end up renaming every commit afterwards, since their names are SHA1's dependent on every previous commit, generating tonnes of churn in many different places as the whole of history basically disappears and reappears elsewhere.

      Many of git's advantages can still be leveraged with SVN; git-svn works pretty well, and it doesn't require massive upheavals in all areas of the project.
    • Re:GIT? (Score:5, Funny)

      by Chemisor (97276) on Wednesday June 04 2008, @02:47PM (#23656703) Journal
      Well, if you believe Linus, it must be because they are ugly and stupid :)
      • Re: (Score:3, Informative)

        You can use a GPL licensed product in any way you wish.
          GPL imposes limits on you only if you distribute GPL code (or the result of its compilation)
        • Re: (Score:3, Informative)

          Git. It's Linus Torvalds fix for his own software management nightmare with the Linux Kernel.
          A talk he did on it [youtube.com]
          http://en.wikipedia.org/wiki/Git_(software) [wikipedia.org]
          • Contrary to Linux, FreeBSD uses a centralized development methodology which SVN is very well-suited for. (Now, if only they hurry up with the stable release of their merge-tracking, I could say that Subversion is perfect for a centralized development model.)

            Then, there's the obvious licensing issue. GIT is released under the GPL, which, I'd guess, is a little too restrictive for BSD-style people. :P

        • Re:dead... (Score:5, Informative)

          by AKAImBatman (238306) <akaimbatman@ g m a i l . com> on Wednesday June 04 2008, @02:48PM (#23656709) Homepage Journal
          Mercurial [wikipedia.org] is the solution currently in use at Mozilla, Sun, and quite a few Linux projects. (Though not the main kernel branch. That's GIT. Think something more along the lines of ALSA.)

          Mercurial is interesting because it encourages teams to work together, pushing and pulling source code from each other. When the source reaches a stable point, you can push that to a central repository for building and archiving.

          The interesting aspect about this design is that it actively encourages branching! Rather than treating branches as a special thing that needs to be done under a certain set of circumstances, it treats every copy of the repository as a branch. So developers can work independently. When they come back together, the tool is able to auto-merge most projects back into a single whole.

          Mercurial is able to do this because it tracks the point of divergence. With that information, it can see if any of the changes truly conflict. 95% of the time, there is no conflict and Mercurial is able to merge the files auto-magically. The other 5% of the time, Mercurial will launch a merge tool and make you answer YES/NO to each difference. This process is amazingly smooth.

          The key thing to keep in mind with Mercurial is that you won't want to keep all your source in one repository. (Like most companies do with CVS.) Keep a separate repository for each project or module. You can keep the repositories all in the same path, but it's much easier to work with only the code you need rather than copying around a 10GB source tree from developer to developer.

          If you do decide to try Mercurial and are given a Windows development machine, I highly recommend TortoiseHG [sourceforge.net]. You'll occasionally have to run 'hg update' from the command line (the tool will prompt you), but it's otherwise a very slick way of working with Mercurial repositories.

          Oh, and don't use the CVS->Mercurial conversion tools. It leaves CVS-style droppings all over creation. Just import the latest codebase and keep CVS running in read-only mode for as long as you need historical data.
          • I think any distributed version control system (ie, pretty much all the new free ones except SVN) will encourage branching, lack of a central authority just about requires this.
            • Re: (Score:3, Informative)

              It is definitely possible to do branch/merge work with CVS/SVN, but you need to track the merge points yourself, and be aware not to merge the same changeset twice. Git and Mercurial make the process far easier by tracking merge points for you.

              Also, one big thing distributed source control gives you is the ability to "clone" or "fork" your own copy of the repository. This lets you make small, incremental changes that you can roll-back and merge back as you like, and then you can "push" all of your commits b
        • Re:dead... (Score:5, Informative)

          by Jason Earl (1894) on Wednesday June 04 2008, @04:09PM (#23658055) Homepage

          If you are used to CVS then Subversion is definitely a step up, and it will be very familiar to your users. What's more it is well supported by IDEs and has piles of other tools like Tortoise that makes it easy for non-developers to use. Heck, if push comes to shove it can even be used as a WebDAV share with the advantage that it will automagically version your files.

          The downside of Subversion is that it isn't very good at merging. Merging branches in current versions of Subversion is a manual process that is ridiculously painful. This can be mitigated somewhat using the svnmerge Python script, but even with the script merging still isn't as easy as any of the distributed version control systems. For people like Linus Torvalds that's basically a showstopper for Subversion. To them merging is basically the whole point of a version control system.

          It's quite possible, however, that you have different needs than the Linux kernel. For example, none of the distributed version control systems deal well with large files. If you want to store multi-media files along with your source then Subversion is basically your only option. Likewise, if you plan on having designers or random office workers use your repository then you can forget about the distributed tools.

        • Re: (Score:3, Interesting)

          Everyone we hire is either already experienced with SVN or picks it up in about 5 minutes. I don't know what the OP is smoking.
      • Re: (Score:3, Informative)

        If you are still using CVS, or CVSup, for updating your ports tree, I suggest you have a look at portsnap(8):

        PORTSNAP(8) FreeBSD System Manager's Manual PORTSNAP(8)

        NAME
                  portsnap -- fetch and extract compressed snapshots of the ports tree
      • Re: (Score:3, Funny)

        Likely, all you will need to do with subversion is this: > cd /usr/ports > svn update ... come back later to an updated portage tree.
        heathen!
    • Re: (Score:3, Informative)

      There are different tools for different purposes:

      CVS is (was) what the central repository uses to store the software.

      Perforce is a central repository for internal development. That way the limitations of CVS for this part of the job don't limit the developers.
      But Perforce is commercial software and you can't push it on to the community.

      Subversion is a free software which has the capabilities which are set as a requirement for the FreeBSD project. It has some capabilities of Perforce, it has some capabilitie