Branching and merging


show more Branching and merging provides you with in-depth training on Developer. Taught by Michael Lehman as part of the Fundamentals of Software Version Control show less
please wait ...

Branching and merging

The last major piece of functionality we need to explore is branching and merging. In SVN, it's done much like tagging. We create the branch from the common parent directory, the one containing the trunk, tags and branches by using svn copy. So let's go back up to the parent directory, make sure we're in the right place, there we can see branches, tags, and trunk, and then we'll execute the following command, svn copy trunk branches\b1, our branches are going to be called b1.

Once again, you can see this is pending, it hasn't actually been created yet. So we do a commit again and create branch b1. Scroll off to the top of the screen, once again log more. There we see it, created branch b1 that's revision 6. Now you notice that SVN doesn't make a distinction between your branches and the trunk in terms of its revision numbers.

All updates go to the same list of revisions, each with its own revision number. This is because the revision number represents revision of the enti...

Branching and merging
Video duration: 5m 32s 2h 55m Intermediate

Viewers:

Branching and merging provides you with in-depth training on Developer. Taught by Michael Lehman as part of the Fundamentals of Software Version Control

Subject:
Developer
Software:
Git Mercurial ALM/TFS Perforce
Author:
please wait ...