On 11-11-11 10:43 AM, mck wrote:
On Thu, 2011-11-10 at 20:56 +0100, mck wrote:
Antonio, any objections to this before i commit the patch?
I'm having some troubles committing the patch via the git mirror. I'm
pretty new to git in general.
I've cloned the mirror, and set it up according to
http://wiki.apache.org/general/GitAtApache and then pulled Nicolas'
patch by doing
git fetch https://github.com/nlebas/tiles.git autotag-runtime
git cherry-pick 038c5a4222
git log # to check i've nicolas' commit merged
git svn dcommit
The last command reports there's nothing to commit...?
Does dcommit only "commit"? What's the equivalent to "push" back to
subversion? Can anyone here help me?
~mck
It's "git svn dcommit", and it should work the way you tried it.
I tried it with --dry-run (since I'm no committer): it finds about 700
diff-trees, except I used "git svn clone -s -r1200278:HEAD" instead of
"git clone"+"git svn init+rebase".
Perhaps something went wrong with the "git svn init/git svn rebase"
part... there seems to be a line in the documentation that cannot be
applied to tiles "as is":
PROJECT_NAME="tiles"
git clone git://git.apache.org/"$PROJECT_NAME"
...
git svn init --prefix=origin/ --tags=tags --trunk=trunk
--branches=branches https://svn.apache.org/repos/asf/"$PROJECT_NAME";
the url for git clone is correct, but not for svn: it should be
https://svn.apache.org/repos/asf/tiles/framework.
Hope this helps
Nick
