use Perl

• That's an interesting observation. (Score:1)

  by duff (16)

  You've nailed something down that's been bugging me for a little while. I'm a definite subversion user but I've been increasingly getting the feeling that subversion doesn't quite fit my way of working. Thus I've been looking at git lately.
  
  The thing is though, that I have no fear of branching because there's a "recipe" for merging and I don't have to think too much about it other than to record revision numbers in the log. So I'm all for branching in subversion. Also though, I tend to not do any complica
  • Re:That's an interesting observation. (Score:2)

    by schwern (1528) on 2007.07.12 14:59 (#56204) Homepage Journal

    there's a "recipe" for merging and I don't have to think too much about it other than to record revision numbers in the log.
    

    
    
    You shouldn't have to think about it at all. Its a rote task. Book-keeping. Monkey work. The sort of things computers are very good at. Humans are very bad and prone to make mistakes.
    
    You might want to look at SVK or the Fisher Price version svnmerge [orcaware.com]. svnmerge does for you what you're currently doing by hand.
    
    

    Also though, I tend to not do any complicated merges because they are too much work (and large potential for me to screw up).
    

    
    
    You're well on your way to conquering your fear, this tells me you still fear branching. "Fear", in code terms, translates into "I don't want to do this because I might break something".
    

    Reply to This

    Parent

    • Re: (Score:2)

      by Matts (1087)

      You shouldn't have to think about it at all. Its a rote task. Book-keeping. Monkey work. The sort of things computers are very good at. Humans are very bad and prone to make mistakes.

      Not quite. There will *always* be cases where a merge has to be manual. It's just not possible to 100% automate merging. SVN could do it better, but it'll never be Monkey Work.