[Building Sakai] Sakai subversion branching question

[Gross,Christopher]

That appears to be exactly what I am looking for.  Now to update my svn so that I have that command!

Thanks!

-Chris

From: Matthew Jones <matthew at longsight.com<mailto:matthew at longsight.com>>
Date: Tuesday, May 8, 2012 1:17 PM
To: Christopher Gross <ufchrisg at ufl.edu<mailto:ufchrisg at ufl.edu>>
Cc: "sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>" <sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>>
Subject: Re: [Building Sakai] Sakai subversion branching question

I think this answers your question.

I do it all in one commit with svnmucc. [1] The idea with svnmucc is essentially that it's able to do mutitple svn commands in one commit by using temp directories. It's just easier. It's included by default in modern svn packages.

https://source.sakaiproject.org/contrib/cle-release/scripts/jenkinsrelease/corerelease.sh

For instance, if I run this on that script
/corerelease.sh https://source.sakaiproject.org/svn/sakai/branches/sakai-2.9.x sakai-2.9.0-b06 sakai-2.9-SNAPSHOT SAK-555

It creates this giganto svnmucc command with like 30 cp commands.

svnmucc -m "Creating tags for next release sakai-2.9.0-b06 SAK-555"  cp HEAD https://source.sakaiproject.org/svn/access/branches/sakai-2.9.xhttps://source.sakaiproject.org/svn/access/tags/sakai-sakai-2.9.0-b06 cp HEAD https://source.sakaip . . .

The only thing you might have to change this this line
SVNMUCCCPDIRS=`cat $TMPDIR/.externals | grep -v "#" | grep -v "master" | awk -F"/branches/| " '{printf " cp HEAD %s/branches/%s %s/tags/%s",$2,$3,$2,"'sakai-$NEXT'"}'`

To actually change the output directory to something else (in this case,  the awk is just replacing branches to tags)

Let me know if you have any questions and/or if this is what you were thinking about?

[1]  https://rhubbarb.wordpress.com/2009/04/08/subversion-tools/

On Tue, May 8, 2012 at 1:04 PM, Gross,Christopher <ufchrisg at ufl.edu<mailto:ufchrisg at ufl.edu>> wrote:
Hello!

I have a subversion question for the list.  When the sakai project subversion team creates a new branch, does each tool's branch get created in its own commit or is there a way to branch them all in one single commit?  The method I am using for our locally maintained sakai code does something different that allows me to do it all in one commit (export trunk, svn add, repeat for each tool, svn commit when done), however since the branches are not created using svn copy, there is no ancestry and thus utilizing subversion's merge features becomes impossible. I am looking to modify how we are using our svn so that I can make use of merge more effectively and if that means I have to do it with one commit per tool then so be it, but I wanted to check with the community first.

Thanks!

-Chris

_______________________________________________
sakai-dev mailing list
sakai-dev at collab.sakaiproject.org<mailto:sakai-dev at collab.sakaiproject.org>
http://collab.sakaiproject.org/mailman/listinfo/sakai-dev

TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org<mailto:sakai-dev-unsubscribe at collab.sakaiproject.org> with a subject of "unsubscribe"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-dev/attachments/20120508/5c56c23c/attachment.html