Anyone that works with subversion will know that merging 2 branches is not always easy. Most of the time there is no issue, and you can merge one or multiple changes from one branch to another, but sometimes you end up with conflicts left right and center. This is done with the standard merge commands:
When creating a new project in SVN one recognised standard is to set up a trunk, branches, and tags directory structure. Where I’m working at the moment, we also have a release directory placed under tags and branches. Which I’ve also started to do on some of my other projects out side of work as well (those that are under SVN anyway)
When I’m reviewing the changes I’ve made to an svn checkout I prefer to see the changes in colour. This would be very easy if I was someone that used a graphical editor, but I’m one of those people that prefer to use vim, or vi if I really have to. As a result I had to think of a way of changing svn diff into something that was easy to read. I found out that vim has a syntax highlight template for diff files, so it got me thinking. What about pushing the diff into a file and then viewing the file in vim.
Continue reading svn diff via vim
We’ve all been there, you’re working on a project with lots of externals and we see a lot of noise when you run svn status or svn st (depending on your preference). Most of the time we just filter that out, but I decided to string a few grep statements together to make the output that little bit nicer to read.
There are loads of little tips and tricks out there on how to make your svn operations a little easier. One which I found out recently was how to leverage bash’s brace expansion to reduce key strokes.
This powerful feature makes svn diff commands a lot easier.
It’s a common problem developers face – how can I see just the changes that have been made and ignore all the line ending changes? This tends to happen when you have members of your team committing changes when they have checked out the code onto different operating systems, be it Windows, Mac of Linux.
svn diff doesn’t really have a built in option for ignoring whitespace, but gnu diff does, and it is possible to use it within an svn diff command by using –diff-cmd