I figured out the magic combination.  I was close, but there was a little of 
extra trickery to get a link from my local Git repository to the Subversion 
head.  What I needed to do from /media/sda3/stuff was:

> git svn clone https://path/to/SVN/repository openembedded 
> -Trelative/path/to/trunk -brelative/path/to/branches -trelative/path/to/tags
> cd openembedded
> git show-ref trunk
> git log --pretty=oneline master | tail -n1

The output of the last two command gets you two different Git references.  The 
first is a reference to the SVN repository and the second is a reference to the 
first commit in your local Git repository.  The two need to be linked as 
follows:
> echo "ref1 ref2" .git/info/grafts

Where ref1 is the SHA-1 ID that references the SVN repository and ref2 is the 
SHA-1 ID that references the first commit of your local Git repository.  After 
that I was able to execute:
> git svn dcommit

and everything from my local Git repository was uploaded to my SVN repository.

If anyone knows of an easier way to do this, let me know.  Is there a good 
place to throw something like this in the Angstrom wiki?

-Bryan

-----Original Message-----
From: angstrom-distro-devel-boun...@linuxtogo.org 
[mailto:angstrom-distro-devel-boun...@linuxtogo.org] On Behalf Of Bryan Evenson
Sent: Monday, April 23, 2012 9:22 AM
To: Discussion of the angstrom distribution development
Subject: [Angstrom-devel] Committing Angstrom to local SVN repository

I have a working Angstrom distribution with an ARM-specific overlay and a 
self-modified image.  We have a local Subversion repository which I have been 
using for revision control of my application software.  I would like to commit 
everything needed to build the Angstrom distribution locally in my Subversion 
repository to guarantee that I can get back to the same spot at a later time.  
Since this is only a few commands and I suspect it will take quite a while to 
run, I wanted to double check that I had things right before I started.

Local Git repository path:  /media/sda3/stuff/openembedded
Desired SVN repository path:  
https://path/to/SVN/repository/trunk/path/to/software/dev/openembedded 
(directory exists in SVN but is empty)

I think what I need to do is:
git svn clone --stdlayout 
https://path/to/SVN/repository/trunk/path/to/software/dev/openembedded
git svn rebase
git svn dcommit -e

If I'm reading the documentation correctly, this should then take everything 
that is part of my local Git repository and add it to my local Subversion 
repository.  Does this look right to everyone else?

Thanks,
Bryan








_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel

_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel

Reply via email to