Re: [RFH] git-svn documentation

Previous thread: [PATCH] git-fetch: Understand the branch property remote="." by sbejar on Sunday, October 15, 2006 - 2:16 pm. (1 message)

Next thread: [PATCH] bisect reset: Leave the tree in usable state if git-checkout failed by Petr Baudis on Sunday, October 15, 2006 - 5:59 pm. (2 messages)
From: Joakim Tjernlund
Date: Sunday, October 15, 2006 - 3:09 pm

From: Eric Wong
Date: Sunday, October 15, 2006 - 8:47 pm

I assume the tmcu* branch is private as I don't see it in the u-boot

Using -q suppresses potentially useful information.  I wouldn't use
it if you're not sure about what you're doing.

I would do something like this:

... (same stuff as above before with svn setup...)
git clone $ORG_REPO $GIT_REPO
cd $GIT_REPO
git-svn init "$REPO"/trunk
git-svn fetch

# sync the SVN repo with initial-uboot
# this will just commit a snapshot, without history, which I assume
# is what you want.
git-branch initial-uboot f5e0d03970409feb3c77ab0107d5dece6b7d45c9
git-svn commit initial-uboot
git checkout -b svn-branch remotes/git-svn
git-pull . tmcu2

# this should work assuming the path from initial-uboot..tmcu2 is linear
# use gitk initial-uboot..tmcu2 to check
git-svn dcommit

Also, git-svn is really designed for individual developers who prefer to
use git, but need to interact with project that already uses SVN.
u-boot already uses git, so I don't see why you'd need git-svn :)

-- 
Eric Wong
-

From: Joakim Tjernlund
Date: Monday, October 16, 2006 - 3:06 am

Eric Wong wrote:


Great! This was exactly what I wanted, thanks. I never realized that one should
do git-svn commit initial-uboot to get that single commit.
I also replaced git-svn dcommit with git-svn commit remotes/git-svn..svn-branch
as I don't have that version yet.

You should add this as an example I think.

Can I ask for an example that used multi-init and multi-fetch? I tried, but

Yes, but the thing is that the rest of our product is svn based including
the build env. So I have to supply a SVN tree for build purposes and if someone
else has to do a minor fix I can't ask him to learn git first :(

 jcoke

-

From: Eric Wong
Date: Monday, October 16, 2006 - 11:31 am

git-svn multi-init https://svn.musicpd.org/mpd -T trunk -t tags -b branches
git-svn multi-fetch

In the latest git-svn (should be in 1.4.3), you can re-run 'git-svn
multi-init' with no arguments to discover new tags+branches.

Anybody willing to supply patches for better documentation?  I'll be
quite busy with other projects the next two weeks, asciidoc is quite
slow for me; but I'd like to have better docs for git-svn in 1.4.3.

-- 
Eric Wong
-

From: Joakim Tjernlund
Date: Monday, October 16, 2006 - 2:44 pm

This is how far I got too(sorry for beeing unclear). It is the 
remaing bits that I got stuck on. How would the remaining git-svn

That would be great, I am still very much in the dark.

 Jocke

-

From: Seth Falcon
Date: Wednesday, October 18, 2006 - 10:22 am

I'm starting to use git-svn more and would be willing to attempt to
contribute some additional docs.  What I have in mind is a howto use
git-svn sort of document (unless that isn't seen as useful)

... unfortunately, as I use git-svn more I'm encountering some
questions which will need resolution before I can have much confidence
in my howto :-\

Will post some howto and questions separately.

+ seth
-

Previous thread: [PATCH] git-fetch: Understand the branch property remote="." by sbejar on Sunday, October 15, 2006 - 2:16 pm. (1 message)

Next thread: [PATCH] bisect reset: Leave the tree in usable state if git-checkout failed by Petr Baudis on Sunday, October 15, 2006 - 5:59 pm. (2 messages)