Getting very accustomed to bzr

Having to work with svn again at a client site... I miss bzr.  Even bzr-rebase is turning up fondly in my memories.  It's really just the merging... merging with svn seems to always be an "Oh good Lord! We have to MERGE!" event, filled with conflicts and crashes halfway through switching that leave 1/2 of the checkout on the old branch and 1/2 on the new branch.  With bzr it's just "okay, time to rebase and push"... and sure there's a conflict once in a while, but you just choose which version you want and go forward... you don't get into these nutty situations where you realize that 1/2 of your changes just got committed to the wrong freaking branch because a switch failed.

Totally a matter of perception, I'm sure, but I still miss bzr.  That said, all of my attempts at installing bzr-svn this week so I could use it instead failed miserably with weird errors deep in the packages that were obviously something to do with my setups (on the two machines) but which I didn't have time to track down.  Sigh.

Comments

  1. Jeremy Cantrell

    Jeremy Cantrell on 12/11/2008 10:04 a.m. #

    What version of svn are they using? I used to feel that way about svn merges, but since 1.5, it's much nicer. I still prefer git merges, though ;)

  2. Mike Fletcher

    Mike Fletcher on 12/11/2008 5:23 p.m. #

    Afraid it's 1.5.1 on my machine. I've never actually seen this particular behavior before (I used to use svn for most of our projects), but I can't say I ever really liked merging in CVS or SVN.

Comments are closed.

Pingbacks

Pingbacks are closed.