On Saturday 11 July 2009 19:48:58 Michael Sparks wrote:
> Excellent, what I'll do then is merge this branch onto trunk, and I suggest
> that you work on your changes on a branch
Just as a note, I've done this.
In case you've not used svn to create branches before, the way to do
this is as follows.
Assuming you have a full checkout of the codebase via:
svn co https://kamaelia.googlecode.com/svn kamaelia
You create a branch as follows:
cd kamaelia/branches
svn cp ../trunk/Code/Python private_RW_<whatever you like>
svn ci private_RW_<whatever you like>
The last line is important, since at a later point in time it allows you to
do this:
svn log --stop-on-copy
To find out all the changes. Or more specifically:
svn log --stop-on-copy|egrep '^r[0-9]+'|tail -1
eg:
~/code.google/kamaelia/branches/private_MPS_RW_JsonRpc> svn log
--stop-on-copy|egrep '^r[0-9]+'|tail -1
r6204 | sparks.m | 2009-07-07 22:52:07 +0100 (Tue, 07 Jul 2009) | 1 line
To give you the first revision for the branch. (ie the svn ci above). In this
example "r6204"
This then allows someone reviewing the branch to see all the changes on
that branch simply as follows:
cd <branchname>
svn diff -<branchpoint revision>:HEAD .
eg:
cd private_MPS_RW_JsonRpc
svn diff -r6204:HEAD .
This also then allows someone reviewing your code (or you if there's general
agreement) to merge the changes on /trunk as follows:
cd trunk/Code/Python
svn update
svn merge -<branchpoint revision>:HEAD ../../../branches/<branchname> .
Incidentally, this also means that renaming a branch is a pain in SVN,
since it breaks this work flow.
The other final request I'd make as a result of this, is that checkin
messages mention why a change was made.
However, once again, please note that the namespaces I mentioned I
view as "owned" by yourself, because you're the one building & using the
application :-)
It's just that doing these things makes it easier for people to work with
you. It does also mean you can have a working branch for your code at
any point in time and not be blocked whilst waiting for a merge onto
/trunk.
If you already know all the above, cool, if you have any q's fire away :)
Regards,
Michael.
--
http://yeoldeclue.com/blog
http://twitter.com/kamaelian
http://www.kamaelia.org/Home
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"kamaelia" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/kamaelia?hl=en
-~----------~----~----~----~------~----~------~--~---
