Branches

From Blazegraph
Jump to: navigation, search

Most new feature development needs to take place in a branch. This page needs updating for GIT guidelines.

SVN

Creating a Branch

Collapse a project. Right click on the project root. Team => Branch

Assign a branch name: https://svn.code.sf.net/p/bigdata/code/branches/BRANCH_NAME

Choose NEXT.

Create copy from: HEAD REVISION IN THE REPOSITORY (the current committed code in SVN).

Provide a commit message when prompted.

Set this flag if you want to start working in the new branch immediately: [x] Switch to a new branch

Make a note of the revision from which your branch was created. To do this, use "svn info" at the root of the project of the source branch. Best to put this revision number in a ticket associated with your branch so that it does not get lost.

Finish.


Setting up CI on a branch is also simple. You need to have the login to jenkins to do this. Basically, you clone an existing job, change some of the parameters (job name, SVN URL) and let it go.

Keeping Your Branch Up to Date

Collapse on your project branch. Right click on the project root. Team => Merge

Choose the two URL option.

Both URLs should be the source branch from which your branch was created. For example, if your branch was created from the 1.3 maintenance branch, both URLs should point to the 1.3 maintenance branch.

The "from" revision should be the revision at the original branch point or the revision noted from the last time you merged.

The "to" revision should always be HEAD.

When you do this, make a note of the current HEAD revision on the source branch. To do this, use "svn info" at the root of the project of the source branch. Best to put this revision number in a ticket associated with your branch so that it does not get lost. This revision number will be the new "from" revision the next time you do a merge.

git

List the tags:

 git tag -l

Tag a release:

 git tag -a v1.3.3 -m "1.3.3 release"
 git push origin v1.3.3