What is merging in svn?

In Subversion terminology, the general act of replicating changes from one branch to another is called merging, and it is performed using various invocations of the svn merge subcommand. In the examples that follow, we’re assuming that both your Subversion client and server are running Subversion 1.7 (or later).

What is different between branch and tag in svn?

There is no difference between branches and tags in Subversion. The only difference is in what the user then does with the directory. Branches are typically created, edited, and then merged back into the trunk. Alternatively, tags are created as a snapshot of the project at a point in time and then never changed.

What is checkin and checkout in svn?

When a developer has made changes to the code, those changes are not yet in the repository, but remain on his/her own computer (working copy) until they are ‘checked in’. By checking in these changes (or committing them) the developer adds their changes to the repository.

What is Update item to revision in svn?

Update item to Revision changes this base revision, making BASE out of date. When you try to commit local modifications, SVN will notice that your BASE does not match the repository HEAD. The commit will be refused until you do an update (and possibly a merge) to fix this. Revert to revision does not change BASE.

What are trunk and branches in SVN?

The trunk is the main line of development in a SVN repository. A branch is a side-line of development created to make larger, experimental or disrupting work without annoying users of the trunk version.

What is merge in Tortoise SVN?

If you want to merge changes into a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using TortoiseSVN → Merge…. In general it is a good idea to perform a merge into an unmodified working copy.

What are branches in SVN?

A branch in SVN is sub development area where parallel development on different functionalities happens. After completion of a functionality, a branch is usually merged back into trunk. A tag in SVN is read only copy of source code from branch or tag at any point of time.