Posts Tagged: svn

SVN Resolving Conflicts

While I guess it’s showing its age, but subversion is still a pretty good source control tool. My problem with it is that I’m always confused about what to do when I get a conflict. This is probably because I only deal with this issue a few times a year. Here’s what I do when… Read more »

SVN Merge Changes From Branch into Trunk using Reintegration

If you’re like me, when using subversion, you have a trunk, and then you create branches for code fixes and enhancements. But if you’re like me, you already know how to do this and so reading this is a waste of your time. But if you’re REALLY like me, you don’t remember all of these… Read more »

Run SVN Merge Again Using –ignore-ancestry

I had an issue where I accidentally did a svn merge, but what I merged into had changes I didn’t want committed to trunk – yet. But I ran a commit before I realized my error. It’s a good reason to start with a fresh checkout of the code to merge to before doing it…. Read more »

Create SVN Branch with Copy Command

I create SVN branches all the time. If I get a few tickets to work on, I create a SVN branch and work there. Once the changes are done and tested, I roll the changes into trunk. Here’s how to SVN branch. svn copy https://mysvnrepositoryserver.com/dept/IS/MyProjectNameGoesHere/trunk \ https://mysvnrepositoryserver.com/dept/IS/MyProjectNameGoesHere/branches/NomeOfBranch \ -m “Creating branch for some reason.”

Upgrade Yosemite SVN Client

The subversion command-line client that ships with Yosemite is 1.7. That’s too old for most of us, but fortunately upgrading it isn’t a big deal. Here’s a good tutorial to show you how to do it.