![]() ![]() Either commit your changes or revert them. Switching may not sound that exciting but it’s key to branching and merging, as you’ll soon see.įirst off, ensure that your working copy has no local changes. Using the svn switch command you can have Subversion modify your working copy to reflect another directory in the repository. If you initially checkout a branch, it reflects that branch. If you initially checkout trunk, then your working copy reflects trunk. Your local working copy reflects some directory in the remote Subversion repository. When your development is complete, merge changes from your branch back into trunk.Develop in your branch, periodically merging the latest changes from trunk into your branch.When you want to work on a new branch you’ll follow these general steps using Subclipse, which are described in more detail below: I’ll also assume that you have already checked out a local working copy of trunk, and that you’ve already created an Eclipse project using this working copy. In other words, a repository at with trunk, branches, and tags subdirectories. The discussion below assumes that you have a Subversion repository that uses the standard trunk/branches/tags structure. Instructions on this page were inspired by the Subversion Red Book. You should be using Eclipse 3.5, Subclipse 1.6.x and Subversion 1.6.x. In this post I’ll show just how easy it really is thanks to some newer features in Subversion and Subclipse (a Subversion plug-in for Eclipse). However, it has a reputation for being so difficult that many developers never take advantage of it. Branching and merging in Subversion is a great way to work on large new features without disrupting mainline development on trunk.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |