Stories
Slash Boxes
Comments
typodupeerror delete not in

Comments: 173 +-   The Future of Subversion on Friday May 09 2008, @11:03AM

Posted by kdawson on Friday May 09 2008, @11:03AM
from the had-a-good-run dept.
software
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.
story

Related Stories

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.
  • S/N Ratio (Score:4, Funny)

    by Anonymous Coward on Friday May 09 2008, @11:06AM (#23351224)

    The comments on the blog post have high S/N.
    And posting it here is really going to help!
  • by Wulfstan (180404) on Friday May 09 2008, @11:08AM (#23351268)
    I run the IT systems for my small software company and frankly Subversion is a great tool for the job. I don't *want* a distributed VC system because I don't want the hassle of trying to ensure that everyone's modifications to the code tree are backed up correctly and stored safely somewhere. I want it in a central spot I can back up and manage without my employees having to worry about it.

    Basically Subversion is not suited for development with a diverse population of loosely connected individuals, each with their own private branches. Frankly, for corporate work, I don't understand why you would want the backup and integrity hassles of a distributed version control system. But maybe that's because I'm ugly and stupid :-)
    • by mweather (1089505) on Friday May 09 2008, @11:17AM (#23351426)

      I run the IT systems for my small software company and frankly Subversion is a great tool for the job. I don't *want* a distributed VC system because I don't want the hassle of trying to ensure that everyone's modifications to the code tree are backed up correctly and stored safely somewhere. I want it in a central spot I can back up and manage without my employees having to worry about it.
      You can do that with distributed version control, too and still have the flexibility for alternative work flows.
      • Re: (Score:3, Interesting)

        Errr. I don't see how without jumping through a lot of hoops.

        If I have n users in my software team and they each have a local repository copy and "commits" that they make are made to that local repository then it basically requires me to backup everyone's PC in order to ensure that work is not lost. I don't back up PCs, we have a clear rule that if you want something to be safe it goes on the server.

        Now, sure, I can see that with some effort and mucking about you can ensure that everyone's local repository
        • by maxume (22995) on Friday May 09 2008, @12:13PM (#23352286)
          A DVCS can still be used to commit to a server.

          The big difference is that a DVCS adds a local workspace. I can check something out from the centralized server(with a DVCS, I pull the server tree to my local tree), mess around, make a branch, see what it does, decide it was stupid and throw the whole thing away, or I can decide it was a good idea and then commit it to the centralized server(by pushing my tree up to the central tree). The only real difference is that a check out is called a pull and a commit is called a push.

          Separating change management from committing to the repository is not necessarily a bad thing. It may be undesirable in many situations, but it can also be handy.
            • by maxume (22995) on Friday May 09 2008, @12:42PM (#23352666)
              Right, but with server only commits, people wanting to do experiments may not bother doing any version management if they don't want to hassle with creating a branch to hold the work. Cultural problems come up in both situations.
          • You also get all the other benefits of DVCS that Subversion doesn't do or doesn't do well.

            Examples? Specifically, I'm wondering what advantages a DVCS can offer in a situation where what you would choose is very close to or exactly like the centralized model that something like Subversion forces on you -- and similarly, what the trade-offs are.

            I know that's not the situation for most Open Source projects, but I think it is the case for a lot of businesses that are currently running Subversion, or are looki
            • Re: (Score:3, Interesting)

              One of the best things is you can checkin changes, roll back to previous versions, branch, merge, etc... all on your local repository while you're on the plane or beach where there is no network access. With Subversion you can't do that. So if you have this crazy idea but don't have network access, you either have to make changes to your current work area and risk screwing stuff up and possibly losing any changes you already have in that work area (which may not be as crazy and speculative) or you might j
              • Thanks, I hadn't thought of that. So which DVCS would you recommend?
                • by burris (122191) on Friday May 09 2008, @12:28PM (#23352490)
                  I have worked with almost all of them. Some of them for extended periods of time with developers I sat next to in the office who committed to a central repository but also with distributed teams (distributed teams usually push changes frequently to a shared "central" repo, btw.) That includes Codeville, Git, Monotone, Darcs, and Mercurial. Really, they are all essentially the same and the differences are mostly in implementation and flexibility, especially WRT merge algorithms.

                  A few months ago I switched to git. Git seems like the winner - it's fast, modular, and many people are hacking on it and have written many cool tools (most of which are "built-in" git "commands.") However, its Windows support lags behind the other front-runner Mercurial. Darcs is mostly used by Haskell hackers, Monotone never seemed to really take off, and Codeville has died on the vine.

                  The good thing is you can switch because there are migration tools for almost every one and the histories tend to be isomorphic.
                    • Re: (Score:3, Informative)

                      meanwhile, if you're using SVN on Unix/Linux boxes, you might want to check out svk [bestpractical.com]. All the advantages of a DVCS, but with the central repo being a (possibly pre-existing) standard svn server.

                      (I put the disclaimer about unix boxes in because the last time I had a colleague on a Mac running SVK, there were some minor issues around binary files and line ending munging... I don't know if they are resolved already or not...)
                • by try_anything (880404) on Saturday May 10 2008, @04:31AM (#23359526)

                  I seriously do mind if you write it on your laptop on the beach, check it in to your local repository and then get your laptop stolen (or covered in margeritas).
                  And the Subversion user would presumably have... teleported himself to a wifi hotspot to check in his work?

                  Of course a CVS user only updates once a week and checks in once a month, so being on the beach for a few days wouldn't make any difference at all.

                  I have used Subversion, git, and most recently CVS, and the only big risks I've taken have been with CVS, where everything is so constrictive and painful that I tend to check in as little as possible. The bottom line is that whatever makes for the easiest, most natural development process will result in more frequent check-ins and less lost work.

                  (I've just stopped asking my colleagues, "How do I ___ in CVS?" because the answer is always slack-jawed silence, followed by, "Why would you want to do that?" accompanied with a suspicious squint-eyed stare that makes me feel like I'm in Deliverance, right there in a cube farm full of college-educated yuppies. CVS warps your brain to the point where you don't think there is ever any good reason to, say, rename a directory, and anyone who wants to rename a directory must be some kind of alien, possibly a marketer or a salesman who wandered into the wrong department, because a Real Programmer would never think up such a bizarre idea as renaming a directory to reflect its current contents. I mean, you pick a name, and it stays forever, right, like a street name! You don't go to Market Street and expect to find a market, so why are you surprised to find the networking code in the tpe_bckp directory? Gary Graybeard can tell you all about how it got that way, and it's a fascinating story. Think of all the rich history that would disappear if you renamed it the "net" or "networking" directory. So depressingly literal. And speaking of depressingly literal, the history would *literally disappear*, and the whole reason we have a SCM system is so we don't lose history. So don't go making changes that it doesn't know how to track, you hear?)
          • Re: (Score:2, Interesting)

            There's no reason you can't have a central "official" repository that everyone "pushes" their changes to.

            How is that substantially different from what the OP described?

            In any event, anyone advocates distributed version control has never been responsible for protecting the work of hundreds of developers working in multiple timezones/continents. Enterprises cannot afford the cost in time and money to back up every single workstation; developers have to be given a way to sync their work, at least once a day, with a central repository that can protected against data loss.

          • Re: (Score:2, Insightful)

            Yes, but the point is that it encourages and allows behaviour that is not desirable in a corporate development environment - local checkins. You CAN push your changes to it but equally you CAN just check stuff in locally. In some contexts this is great - but I think in corporate environments it promotes risky behaviour.

            Look - it's a tool - you can use it responsibly or use it irresponsibly - with the right set of rules and processes I'm sure it can be made to work. Local checkins are what really get my goat
              • Re: (Score:2, Interesting)

                I mean the idea of being able to commit changes to your local copy of the repository (whatever that is called in your DVCS of choice) without having them pushed up automatically to a "safe" central location. We encourage the use of private branches in SVN instead. Yes, merging in SVN stinks, but svnmerge.py at least makes it tolerable.

                In my environment servers are backed up and PCs are not, which is why local repository copies I think are risky.

                I appreciate that you could add this sort of feature to a centr
                • Re: (Score:3, Informative)

                  Well, it sounds like the concept of shelving; a kind of partial commit that only you can see, and if you like, can later make public. I don't believe you need distributed SC for that; there's nothing inherient that requires a local server running. I believe MS' Team Foundation Server already supports this. http://msdn.microsoft.com/en-us/library/ms181283(VS.80).aspx [microsoft.com]

                  Maybe it's not the same thing though. To me, the key difference would be running your own private SC server locally to handle the feature vs
    • by peragrin (659227) on Friday May 09 2008, @11:22AM (#23351490)
      i would say it is variable. I can see the point of both.

      subversion is good for small projects, or larger projects with limited number of developers.

      Once you get into the hundreds and thousands of developers working on the same project though you need to think a bit differently in terms of needs of the individual developer, and the group as a whole.
    • Give developers a personal directory on a shared network drive. Developer repositories/branches stay there(*). Backup shared network drive. Done.

      (*) Don't know about any other systems than Bazaar, but I expect they have similar functionality: Bazaar has "checkouts" which enable you to have a local branch (i.e. on C:/Projects/Whatever) while also auto-committing to the "source" (i.e. the shared directory/drive) when you do a local commit.
    • by EricR86 (1144023) on Friday May 09 2008, @11:26AM (#23351550)

      Frankly, for corporate work, I don't understand why you would want the backup and integrity hassles of a distributed version control system.

      Correct me if I'm wrong, but isn't this the major selling point of distributed revision control? The idea being that since it is a distributed repository, everyone has a "backup" of someone else's repository (depending where they got their code from). No distributed copy is necessarily considered more important than another. However in a corporate environment I would imagine it works out quite well since there's an inherent hierarchy. Those "higher up" can pull changes from those "below". Those "higher" repositories you could (and probably should) backup.

      As far as integrity goes I think one of the main goals of both Mecurial and Git was to protecting against corruption (using a SHA1 hash). You're much more likely to get corruption through CVS and SVN, which is awful considering it's in a central location.

      • by Wulfstan (180404) on Friday May 09 2008, @11:38AM (#23351728)
        I'm using the terms backup and integrity in slightly different ways than you are.

        By backup - I mean a tape or location where I know I can look to find the "good" copy that contains the official tree of code that represents what is going into my product. What you are describing is copies of repositories sitting in various locations that isn't really the same as a backup. It's also a bit upside-down - I don't want to be "pulling" fixes from engineers, I want engineers "pushing" fixes into a known-good integration environment.

        By integrity - I mean ensuring that you have all of the fixes you want to have from everyone who should be making changes on a project. NOT file corruption.
        • by EricR86 (1144023) on Friday May 09 2008, @12:00PM (#23352072)

          ...a tape or location where I know I can look to find the "good" copy that contains the official tree of code that represents what is going into my product.

          In a distributed environment usually there's someone's (or a group's) repository that's considered more important than others. In a software setting this could be a Lead Engineer's/QA/Certification's repository. Depending on what your definition of the "good" repository is, you would take the copy from the right place. It opens up in terms of flexibility what code you actually want to get to work with. The upcoming released version of your software from QA, the next-generation stuff that developers are working on, or maybe a new feature that you here so-and-so is working on...

          I don't want to be "pulling" fixes from engineers, I want engineers "pushing" fixes into a known-good integration environment.

          But you have someone who needs to approve a change to a central repository that everyone shares. Right? That person would probably want to examine those changes before they're committed. The only difference between distributed and centralized, in this case, is that it's a required step. Everyone is responsible for their own repository.

          By integrity - I mean ensuring that you have all of the fixes you want to have from everyone who should be making changes on a project
          Again, in a centralized system, someone has to have the responsibility that all "fixes" have been made which isn't much different from a distributed model. And technically anyone is free to make changes to a project locally on their own machine. They just have to notify the "higher" person saying "Hey I've got a fix for so-and-so", and in a controlled manner they can decide whether or not to accept the changes into their own repository.

          I'm no expert on distributed revision control, so anyone please feel free to correct me.

    • by this great guy (922511) on Friday May 09 2008, @11:41AM (#23351792)
      You do realize that a distributed VCS can perfectly be used like a centralized VCS, don't you ? Declare any repository as the "central" one and decide that everybody should push/pull to/from it. That's their power: discributed VCS don't force you into a specific workflow, you choose how you want to use them.
      • Re: (Score:2, Insightful)

        What worries me is that it encourages behaviour which leaves valuable changes sitting on a disk which may not be backed up. I see changes being made to a codebase like valuable little bits of gold which need to be kept somewhere nice and safe, which is not on individual machines but on the server (RAID, redundant power, UPS, etc)

        Yes, if you are disciplined about how you use it then I'm sure you can use it like any centralised VC. It is a tool - it is not evil - it just encourages what I see as risky behavio
        • What worries me is that it encourages behaviour which leaves valuable changes sitting on a disk which may not be backed up.

          Huh ? If you don't push to the main repo, nobody sees your commits. Don't you think this is sufficient to remember DVCS users they need to push regularly ?

          • Re: (Score:2, Informative)

            "Valuable changes" doesn't only mean changes which are destined for HEAD or the equivalent. "Valuable changes" in my opinion is anything and everything that you are doing on a codebase.

            I take your point - if you are responsible in how you use DVCS then I can see that it can be made to work. But in my environment I want all of the changes being made (however offensive or broken) to be centrally auditable and not stashed away in some private repository.
            • by this great guy (922511) on Friday May 09 2008, @01:19PM (#23353108)

              How do you force your cvs/svn users to commit ? You can't, you expect them to be responsible and do it. This isn't much different from a DVCS.

              What if a user wants his work to be backed up but doesn't want to commit because his changes are not ready to be published ? A centralized VCS forces them to commit with the side-effect of making their unfinished work immediately visible in the central repo, while a DVCS lets them commit to a private repo that you can back up independently.

              Your backup requirements can be solved 2 different ways:

              • 1. With any VCS (centralized or distributed), put the users' working directories on private NFS/Samba shares. This way everybody's work, committed or not, is on the file server which can be backed up.
              • 2. Use a DVCS. The users' private repos and working directories can remain on fast local storage on their workstations. A file server contains the main repo as well as private spaces that can be used by the users to periodically push to private repos, so they can be backed up without interfering with the main repo.

              Besides, in this debate, you are completely ignoring the other major advantages of DVCS over centralized ones: scalability, no single point of failure, possibility to work offline and have full access to all of the features of your VCS, usually faster than centralized VCS, low-cost branching/merging, etc.

        • by Chemisor (97276) on Friday May 09 2008, @02:19PM (#23353870) Journal
          > What worries me is that it encourages behaviour which leaves valuable changes sitting
          > on a disk which may not be backed up. I see changes being made to a codebase like valuable
          > little bits of gold which need to be kept somewhere nice and safe

          As a developer, I'll tell you that not all changes are "little bits of gold". Sometimes I just want to try something out, and end up with little bits of crap. The way to think about local changes is the same way you think about non-committed changes to your Subversion repository. In Subversion, I will have plenty of changes sitting on my disk, they just won't be committed until I am satisfied with them. In git, I can commit as many times as I like to my local repository and push only the final version to the central branch. This way I can checkpoint my code with intermediate commits. This is extremely valuable, since those checkpoints might not even work at all, and I would never want them to break the main build, but I can still break up my task into little subtasks and redo or revise each one of them in turn. These subtasks are not backed up in your scenario either, and are much harder to manager there.
  • Git out of here.
  • Git vs Subversion (Score:5, Informative)

    by KiloByte (825081) on Friday May 09 2008, @11:29AM (#23351596)
    While Git obviously has its strong sides, often quite overwhelming, there are cases when it sucks compared to SVN:
    1. timestamps. Subversion doesn't do that by default, but it has good enough metadata support than timestamps can be hacked in easily. For Git, metastore is nearly worthless. If you store a program source, you risk just skewed builds -- for other types of data, lack of timestamps is often a deal breaker.
    2. move tracking: trying to move a directory branch from one dir to another means you lose history. Rename tracking works only sometimes, often it will take a random file from somewhere else, etc.
    3. large files. Take a 100MB binary file into SVN, change one byte, commit. Change one byte again. And again. Git will waste the freaking 100MB for every single commit.
    4. partial checkouts. If there's a 5GB repository, you'll often want to check out just a single dir. With Git, there is no such option.
    5. ease of use. I see that ordinary users, web monkeys and so on can learn SVN easily; with Git, even I had some troubles initially.

    On the other hand, SVN used to have no merge tracking (I wonder what that "limited merge tracking" in 1.5 means...) which for distributed development of program sources is worse than points 1..5 together.
    • Re:Git vs Subversion (Score:4, Interesting)

      by Chemisor (97276) on Friday May 09 2008, @02:28PM (#23354006) Journal
      > 1. timestamps.

      I don't see what you are talking about. git timestamps every commit too.

      > 2. move tracking: trying to move a directory branch from one dir to another means you lose history.

      No you don't. If you use "git mv", like you're supposed to, history moves with you.

      > 3. large files. Take a 100MB binary file into SVN, change one byte, commit.
      > Change one byte again. And again. Git will waste the freaking 100MB for every single commit.

      No it won't. In fact, it will use less space than SVN for that commit. Yes, git supports diffs on any kind of file, and stores them that way. It didn't always, but the current version certainly does.

      > 4. partial checkouts. If there's a 5GB repository, you'll often want to check out just a single dir.

      That's what git submodules are for. Furthermore, git repositories are smaller than Subversion repositories by a large factor. At least twice, and I've seen as much as a tenfold reduction. Linux 2.6 repository is only 255M in size, and that's a huge project. Anything you do will likely be much smaller.

      > 5. ease of use. I see that ordinary users, web monkeys and so on can learn SVN easily;

      Bullshit. The commands are almost exactly the same. I don't know what people are complaining about.
      • by KiloByte (825081) on Friday May 09 2008, @12:50PM (#23352774)

        Regarding #4, If you're only checking out a single directory and allowed to make a commit, how did you build/test your 5GB project?
        Note that I specifically mentioned "for things other than program sources". Most other pieces of software does not require builds, and neither it is monolithic.
        To commit a change to the Linux kernel, you do need to build the whole thing. That's a monolothic thing.
        To commit a change to a webpage, a graphical project, a set of biochem data, you don't need that. Do you need to check out the countless megs of Wesnoth to update your changes to a campaign? That's a modular thing.

        If that directory was an independent piece, it should be in a separate repository since it's logically independent. If that directory is part of a larger whole, you shouldn't be allowed to work with just that one piece. (IMO)
        If I want to modify a 5GB webpage, why would I want to checkout unrelated pieces? And having every subpage in a separate repository would be counterproductive.
      • Re:Git vs Subversion (Score:5, Informative)

        by slipsuss (36760) <sussman AT red-bean DOT com> on Friday May 09 2008, @09:08PM (#23357770) Homepage
        I'm shocked you say this -- for years I've heard nothing but compliments about how readable, well organized, well documented, and stylistically consistent Subversion's codebase is. There's a whole HACKING guide that explains the styles -- both semantic and syntactic. It's something we're quite proud of.

        As a matter of fact, a guy doing a demo at an Apple Developer conference once used the svn codebase as 'something big to compile' when demonstrating the XCode IDE. When we asked why he used svn, he said that it was "the only open source codebase he'd ever seen which compiles with no warnings."

        If you have specific criticisms about the codebase, we'd like to hear. Instead, your post just seems to be about how your personal wish-list of features has never been added, and therefore "the codebase must be really bad." I'm not sensing any logic to this conclusion.

        svn 1.6 is going to likely have .svn/ metadata centralized in one place, the way DVCS systems do. It will also likely make the "extra copy" of files be an optional thing, as many have asked. And svn 1.5 fixes the 'svn mv * foo/' wildcard expansion behavior.

        The fact is: we haven't added your pet features yet because we've been too busy working on other big fish, like FSFS, svnserve, locking, svnsync, SASL support, changelists, interactive conflict resolution, and oh yeah... automatic tracking of merges. :-)

        The working copy code was designed in a specific way -- the scattered .svn/ areas and extra cached copies of files was deliberate, and considered a feature. Just because we can't write 100 lines of code and "magically" make it behave in opposite ways doesn't mean it's a bad codebase. Even the *best* codebases are based on certain foundational assumptions -- some things are abstracted, some aren't. The things you complain about weren't switches we thought we'd ever need to flip, so we put the abstractions in other places.
          • Re: (Score:3, Interesting)

            SVN_ERR(dir_baton->edit_baton->callbacks->file_deleted

            (NULL, NULL, path,

            textbase,

            empty_file,

            base_mimetype,

            NULL,

            baseprops,

            dir_baton->edit_baton->callback_baton));

            Four level of indirection to call a method with 9 parameters... really? Come on.

            This is what object-oriented programming looks like in C, when there's no C++ to make it pretty. You have function pointers and their associated "closure' context objects being passed around everywhere as pairs. And lots of tables of function pointers (vtables). So in this example, we have a local closure object (dir_baton) referencing a vtable within a parent closure object, and calling a function from that vtable.

            Go look at GTK/GNOME: they have the same sorts of problems, though they tend to do thing

  • by Todd Knarr (15451) on Friday May 09 2008, @11:30AM (#23351624) Homepage

    If you're in a highly-distributed development environment like Linux, where the developers are spread across multiple continents and have very little shared infrastructure and a high need to work independently of each other (either because of preference or because they don't want their work stalled by another undersea cable cut half a world away), then yes using a centralized VCS like Subversion is stupid. But if you're a developer on a project where all the developers are in a common location sharing common infrastructure, often literally within speaking distance of each other, then a decentralized VCS like Git is stupid. It's harder to maintain and, in that situation, yields none of the offsetting benefits.

    Analogy: a fleet of Chevy vans vs. a freight train. The vans are far more flexible, they can travel any route needed whereas the freight train's limited to fixed tracks, and their smaller size and lower cost each let you buy a lot of them and dedicate each one to just a few deliveries in a particular area without a lot of overhead. You can fan the vans out all over the city, sending just what you need where it's needed and rerouting each one to adapt to changes without upsetting the others. But if your only delivery each day is 1000 tons of a single product from one warehouse to another 600 miles away, you're better off with that one big freight train.

  • by gweihir (88907) on Friday May 09 2008, @11:39AM (#23351758)
    ... and is primarily focussed on kernel development. Some would even say it is the only thing he knows how to do. That is fine, but it does not make him an authority on version control systems for other types of projects. Kernel development has very specific needs, not mirrored by other projects. Personally I find SVN perfectly adequate for small teams, and not only for program source code, but also for texts.
    • by nuzak (959558) on Friday May 09 2008, @12:08PM (#23352192) Journal
      Linus has a long history of flapping his jaw about kernel development topics he knows nothing about as well. To his credit, they often become topics that he didn't know about at the time that he then becomes well-educated on (SMP and /dev/poll to name a couple) but sometimes it's on things he religiously refuses to learn anything further about (microkernel architectures).

      He's an excellent assembly hacker, a fast learner, and at least a majority of the time a nice guy, so most people overlook it.
    • Even when I code by myself on my own projects I greatly prefer the flexibility of git over Subversion. Why settle for "perfectly adequate" when you can have your choice of several tools that are much better?
      • by burris (122191) on Friday May 09 2008, @12:13PM (#23352288)
        Seems to me that most of the people promoting DVCS have used them and have seen the light. Once you use a DVCS on a project you don't want to go back to the bad old way of doing things.

        Most of the people knocking DVCS or saying they can't see the benefits haven't actually used them on any projects. They have built up a framework in their minds of How Things Should Work, but unfortunately that model was defined by the limitations of their tools.

  • we use SVN (Score:5, Interesting)

    by Jack9 (11421) <Jack9 AT teacher DOT com> on Friday May 09 2008, @12:21PM (#23352402)
    IDE integration:
    SVN is currently integrated with our IDEs (all 3), one of the main selling points in choosing a VCS.

    Ease of backups:
    We archive our repositories every day, IT loves being able to simply tgz the SVN directory and not have to worry about anything else, regardless of the state of any current projects (all groups use SVN).

    Simplicity:
    SVN/Trac training (client use, management, backend workings) takes less than 10 minutes. In another 15 minutes I can have someone setting up their own SVN repositories+Trac, without needing to pull up a single reference document, primarily because the an SVN setup methodology is trivial to memorize.
    • Re: (Score:3, Informative)

      On IDE Integration

      I use Visual Studio with SVN at work, and while it doesn't have IDE integration (AnkSVN sucked last time I tried), which would be optimal, I find that using TortoiseSVN to be pretty adequate, if not better than IDE intergration in a lot of ways (Don't have to open the IDE to do an update on your local copy). I think the thing that makes both IDE integration and TortoiseSVN great is to be able to use a nice GUI to manage you checkins and updates. I mean, the command line works, but this
      • Re: (Score:3, Insightful)

        I personally use Tortoise but the IDEs tend to not be change-aware unless I'm using the integrated tool.
  • SVN's weaknesses (Score:4, Interesting)

    by Scareduck (177470) on Friday May 09 2008, @12:29PM (#23352516) Homepage Journal
    Without saying too much about distributed version control schemes like Git (which I have never used), I have two major beefs with SVN:
    • Merges in a typical environment become effectively anonymous. Let's say you have a build manager and individual developers working on different changes in parallel. The build manager can't merge the changes without those changes taking on his identity, that is, all identifying information about the originator of the changes is lost.
    • So-called "best practice" for SVN branching means building new branches with every new release. That is, it's not recommended to build one branch and merge changes from the trunk into it as you're incrementally changing things on that branch, noooo. You have to keep polluting the repository with needless hair by making new branches every week, and sometimes, multiple ones per day.
    These are just two I'm aware of that bite us in the ass on a regular basis. The first issue is supposed to be fixed in one of the near-term mods to SVN, but the fact that the second even exists tells me that the guys developing SVN don't really work in the same world as a lot of the bigger commercial development environments do.
    • The build manager can't merge the changes without those changes taking on his identity, that is, all identifying information about the originator of the changes is lost.

      Since I'm sure you're not talking about what svn blame gives you, what do you mean exactly?

      That is, it's not recommended to build one branch and merge changes from the trunk into it as you're incrementally changing things on that branch, noooo.

      Umm, says who? Thanks exactly what we do. We have /trunk and /branches/devel. When one of us gets a particularly stable version of /branches/devel ready, we merge it to /trunk.

      You have to keep polluting the repository with needless hair by making new branches every week, and sometimes, multiple ones per day.

      Have to? No way. But since branches are basically free, why would you want to avoid them?

      We use them for experimental "what-if" branches, like "I wonder what would happen if I ported our application from MySQL to SQLite". You copy "/branches/devel" to "/branches/sqlite" and hack away. If it works, merge your changes back to devel. If it bombs, just delete the branch./P

  • by lpangelrob (714473) on Friday May 09 2008, @12:29PM (#23352518)
    ...getting all the other IT people in the office to use it. Even better? Getting them recognize why version control is so useful in the first place. :-D
  • by IgLou (732042) on Friday May 09 2008, @12:30PM (#23352530)
    If you are one of those MSDN shops where you went to subversion because VSS is weak, you can go with Team System. We were using VSS before and Team system is way better for version control plus it has defect tracking and a build agent. Also, they have caching server to aid distributed environments. Considering it's free (sort of) with your MSDN license (I think it's with their "team edition" licenses) it's tough to beat. It's tough to beat that, especially for larger shops. The only things I don't like in some ways is how it represents the branching and the source control permissions and that was comparatively minor problems. I work in Config Management/Build and so I don't know what Joe developer would like/dislike about it.

    If you're not an MSDN shop then what to use is more problematic. I really liked subversion but that was years back. From what I recall for what it was it does well. The only product I was ever "wow'ed" with was Accurev. That product deals with branching like a breeze and I think they might have a defect tracking module now.
  • by icknay (96963) on Friday May 09 2008, @01:19PM (#23353102)
    This probably should have been in the summary -- merge tracking is being added in 1.5, so bouncing changes from one branch to another is now easy. This is a huge feature, and something as I recall Linus specifically complained about in his talk.

    http://blogs.open.collab.net/svn/2007/09/what-subversion.html [collab.net]

    BTW, they did a really nice job of mapping out the use cases and whatnot before implementing the feature. I guess source control people are natural planners.
    http://subversion.tigris.org/merge-tracking/requirements.html [tigris.org]

    Anyway, I'm sure the world will continue to have need for both distributed and client/server source control systems, and Subversion is a nice example of the latter.
  • by Cyrano de Maniac (60961) on Friday May 09 2008, @01:38PM (#23353318) Homepage
    What I don't see mentioned very often, if at all, is the implicit assumption in distributed systems such as git, that a single person has ultimate integration responsibility and authority in order to form the official/mainline release. That is, given a single tree that is considered the main one from which all others ultimately derive (Linus' tree in the Linux case), there is absolutely no way for tools such as git to allow collaborative maintenance of that tree. In the end, the owner of that tree must perform all checkins to the tree, and must resolve all merge conflicts themself. This is a dual problem in that it wastes the time of a potentially talented developer (e.g. Linus) doing the mundane work of merging and integration, and the additional problem that if this mainline tree owner is not an expert in some particular area of the code, they are likely to make mistakes when resolving conflicts or performing other integration tasks.

    Contrast this with a centralized source model where all developers have the ability to check in to the tree, optionally coupled with a peer review process, enforced either through convention or through mechanisms in the tools. Under this model each developer is responsible for their own integration and merging efforts, not wasting the time of a centralized authority. Not only is the central authority freed from routine tree maintenance work, but each developer can make the best and wisest decisions regarding the particular area of the codebase in which they are an expert, and not have to become involved in areas they have little experience with. Granted, for larger projects there is still a need for some management of checkin authorization, particularly to avoid conflicts during large tree merge operations and the like, but it's more of a coordination role than an authorization role.

    This second model is what my employer uses, and our homegrown source control system is well-tailored to it (it actually has capabilities for more centralized control, but they are by and large unused). Perhaps this is unusual, as my experience with other employers is minimal, and mostly took the form of "copy your code into this directory once in a while" (i.e. "Source control? Why would we need that?"). However, given adequately diligent and intelligent developers, I have to say it works marvelously.
    • Re: (Score:3, Insightful)

      What I don't see mentioned very often, if at all, is the implicit assumption in distributed systems such as git, that a single person has ultimate integration responsibility and authority in order to form the official/mainline release. That is, given a single tree that is considered the main one from which all others ultimately derive (Linus' tree in the Linux case), there is absolutely no way for tools such as git to allow collaborative maintenance of that tree. In the end, the owner of that tree must perform all checkins to the tree, and must resolve all merge conflicts themself. This is a dual problem in that it wastes the time of a potentially talented developer (e.g. Linus) doing the mundane work of merging and integration, and the additional problem that if this mainline tree owner is not an expert in some particular area of the code, they are likely to make mistakes when resolving conflicts or performing other integration tasks.

      The reason you don't see it mentioned very often is because it's not really an issue. You just need that single person to be able to trust at least some of the developers they get changes from. Get the trusted "lieutenants" to do the merging for their particular areas. They can even delegate responsibility further. Since in a centralised system you have to trust all the developers to do merging this is no worse, and potentially better.

    • Re: (Score:3, Informative)

      All version-control systems do that. It's not optional: you have to have meta-information about the checked-out files available, and there's no place in the files themselves to put that information. Now, you might want to look at the distinction between a working directory (with all the tracking files present, allowing the developer to check in and out, compare with different revisions in the tree, all the normal things) and an exported tree (created using for example the CVS "export" command, contains only

"This generation may be the one that will face Armageddon." -- Ronald Reagan, "People" magazine, December 26, 1985