On Thu, Aug 1, 2013 at 1:19 PM, Benjamin De Kosnik <b...@redhat.com> wrote:
> You'll need a GWP to do the merge (Maybe Diego, Jason, Richard > Henderson?) and then add yourself to MAINTAINERS for libvtv. Eh, no. We need a GWP to approve the final patch, but Caroline can and should do the merge herself. The easiest approach is to generate a patch on an svn checkout of trunk. Caroline and I discussed this earlier today. It goes something like this (on a git client): $ git checkout -b vtv vtv $ git merge origin/trunk ... fix merge conflicts ... $ git commit $ git diff trunk >patch ... Get rid of all the ChangeLog.vtv and configure diffs ... ... Use git log to find the svn revision REV for the local trunk git tree ... $ git co svn://gcc.gnu.org/gcc/trunk@REV $ patch -p1 <patch $ svn add ...new directories and files... At the end of this you'll have a checkout of trunk with the vtv changes in. You can now test it and send the final patch to the list for a GWP to review. Diego.