I needed to roll back an SVN commit done recently to an init script for one of our daemons, it’s a very easy process!

First we need to see what the latest revision number of the file that we want to roll back is

<br /> Chill:files idimmu$ svn info slee<br /> Path: slee<br /> Name: slee<br /> URL: https://svn.idimmu.net/msu/trunk/puppet/modules/jnetxslee/files/slee<br /> Repository Root: https://svn.idimmu.net/msu<br /> Repository UUID: 573313b0-15b8-499c-acf0-a5a26a3c7166<br /> Revision: 1517<br /> Node Kind: file<br /> Schedule: normal<br /> Last Changed Author: idimmu<br /> Last Changed Rev: 1256<br /> Last Changed Date: 2010-08-12 10:51:15 +0100 (Thu, 12 Aug 2010)<br /> Text Last Updated: 2010-08-12 10:50:57 +0100 (Thu, 12 Aug 2010)<br /> Checksum: 8940fdf3ed6ee8281b94f55c2fe7880a<br />

I got this annoying SVN error today, that I hadn’t come across before. Even after resolving the conflict in the file, highlighted by lots of «««<, I still couldn’t get my commit to work!

idimmu@boosh:~/work/systems/trunk/dns$ svn ci idimmu.net -m “new funky domain”
svn: Commit failed (details follow):
svn: Aborting commit: ‘/home/rus/work/systems/trunk/dns/idimmu.net’ remains in conflict

After some reading it was easy to resolve!

idimmu@boosh:~/work/systems/trunk/dns$ svn resolved idimmu.net

Resolved conflicted state of ‘idimmu.net’

Our developers were experiencing a weird problem recently with our SVN installation where they couldn’t copy any files in SVN, they would always get the following error

<br /> svn: COPY of /project/!svn/bc/5121/trunk/path/file.gif: 502 Bad Gateway (https://svn)<br />

A quick fix of course would have been to just create a new file and copy the contents but this wouldn’t have kept the file history. A quick google lead to this page and a solution!