Subversion Sucks
July 16th, 2007
That’s it. I wanted to use subversion for all sorts of reasons, but I’m spending (when you tot it all up) about an hour a day working around it.
Merge conflict during commit
svn: Commit failed (details follow):
svn: Your file or directory ‘default/views.py’ is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
There has to be a better way. In fact, I tried writing an rsync script to do a simple server update… all I then would need to do is make it make backups (brute force copy everything would be good enough at this point).
I am SOOOOOO fed up of doing pointless geekery. Bye bye subversion, nice idea terribly executed.
July 17th, 2007 at 10:32 pm (#)
Uh, are you sure you’re using it correctly?
The error above is what happens when you try to commit from an out-of-date working copy. Just run ’svn update’ and try again. If there are any true conflicts, they’ll appear in your working copy for you to resolve (and if those occur, they’re not due to Subversion, they’re due to the data itself, and any version control system would require a human-assisted merge at that point).
http://svnbook.red-bean.com/ has more information about the checkout-modify-update-commit cycle, and information about resolving conflicts (although they’re usually rare).
I don’t think what you’re seeing is a problem in Subversion. I think it’s (probably) pilot error :-).
July 17th, 2007 at 10:33 pm (#)
I forgot to ask if you have used other version control systems (e.g., CVS, Perforce, whatever) before.
July 26th, 2007 at 9:10 pm (#)
Not pilot error I’m afraid… wish it was…
August 1st, 2007 at 10:04 pm (#)
Svn is a good implementation of a model of version control which is being rapidly left in the dust — these are not my words, I read them on Joel on Software, but it’s so true I wish I had said it first.
June 7th, 2009 at 7:41 pm (#)
This is a version control tool. The point is to prevent pilot error.
If I was willing to use a tool that required process to make it work I could have zipfiles with time-date stamps. But if somebody didn’t follow all the rules the system breaks down.
Enter svn.