On Thu, Jun 16, 2011 at 1:23 PM, Robert Osfield <robert.osfi...@gmail.com>wrote:
> On Thu, Jun 16, 2011 at 7:05 PM, Jeremy Moles <jer...@emperorlinux.com> > wrote: > > Absolutely; though, rather than submit each modified file, will you take > > an "svn diff" in this case? :) > > The ideal form of submissions for me is all the files in their > respective directories - I have a merge script that just walks through > each on a fires up xxdiff automatically. > > I would be nice to have a script that takes an svn diff output and > then creates a package containing the complete files. I guess Cmake > should be capable of doing this for us given a little script magic. > > Robert. > If you use the Git mirror at https://github.com/openscenegraph/osg and put each would-be submission in its own feature branch, you can have git spit out a zip containing complete files in the right directories. I've attached (and pasted) the script I use, used as follows: zip-changes-between OpenSceneGraph-2.8 my-topic-branch > thefiles.zip #!/bin/sh git diff --name-only $1 $2 | xargs -d'\n' git archive --format=zip $2 Also, this makes it easy to port changes from one branch to another - suppose I want to port my-topic-branch to trunk (mirrored as "master" in git - here assuming that your master branch is up to date). git branch my-topic-branch-trunk my-topic-branch # create a new branch at the same place git rebase --onto master OpenSceneGraph-2.8 my-topic-branch-trunk # order of arguments: destination parent branch, original parent branch, branch to backport This ends up being mostly automatic for many changes. Ryan -- Ryan Pavlik HCI Graduate Student Virtual Reality Applications Center Iowa State University rpav...@iastate.edu http://academic.cleardefinition.com
zip-changes-between
Description: Binary data
_______________________________________________ osg-users mailing list osg-users@lists.openscenegraph.org http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
