Greetings,
Here are some guidelines on how to branch Hackystat to support the upcoming SDT evolution
work. (These instructions are more explicit and also differ a bit from the instructions I
gave at the CSDL meeting today. For example, I forgot that the convention is to put the
branch in branches/<jira-ID>).
I'm assuming you're using TortoiseSVN. If not, do the analogous thing in your SVN client
of choice. There are different ways to make a branch, but here's one way that works and
is simple:
(1) Find the Jira issue ID associated with the SDT evolution work you're going to do. (In
my case, it's HACK-631).
(2) Find your Hackystat SVN-controlled directory, right click, and select "Tortoise SVN |
Repo-Browser".
(3) After the Repository Browser comes up, select the
"svn://hackydev.ics.hawaii.edu/hackystat" URL and right-click, then select "refresh".
(4) Now you should see under that URL two subdirectories, "trunk" and "branches". Expand
the "branches" directory and you'll see a directory named "HACK-502". That's the branch
I used for the FileMetric evolution. You're going to add a sibling directory with your
own <jira-ID> that will hold a copy of the entire Hackystat source tree.
(5) To make your branch, right click on the "trunk" directory, select "Copy to..", and in
the dialogue box that comes up, provide
"svn://hackydev.ics.hawaii.edu/hackystat/branches/HACK-???", where ??? is replaced by the
ID for your particular Jira ID. Then click OK.
(6) After 10 seconds or so, you should now find a new directory in the "branches" folder
called "HACK-???", where ??? is your Jira ID. You might want to expand that directory
to see the contents just to confirm to yourself that the entire system is now in that
branch.
(7) Exit the repo-browser. Now right click on your SVN controlled directory containing
your local copy of the "trunk" of the Hackystat source code. Select "TortoiseSVN |
Switch ...". In the dialogue box that comes up, provide the URL to your branch, i.e.
"svn://hackydev.ics.hawaii.edu/hackystat/branches/HACK-???", where ??? is replaced by the
ID for your particular Jira issue. Click OK. After a bit of time, it will tell you that
your local working copy is now the branch.
(8) You can now edit your working copy, commit your changes, and they will go into the
branch. If you want to make changes to the trunk instead, you can use the SVN 'switch'
command to move back and forth easily.
Important Note: Merging changes from the trunk into your branch is not completely
straightforward in SVN--you have to keep track of the revision number associated with
when you made the original branch and with any prior merges you've done. It's not hard,
but before doing any merges, be sure to read about the procedure in the SVN book.
Happy Branching!
Cheers,
Philip
