RE: git-svn and u-boot broken.

["Joakim Tjernlund" <joakim.tjernlund@transmode.se>]

> 
> Joakim Tjernlund <joakim.tjernlund@transmode.se> wrote:
> > > 
> > > Joakim Tjernlund <joakim.tjernlund@transmode.se> wrote:
> > > > > > Also, which version of git-svn are you running?  
> Also, which 
> > > > > > version of
> > > > > > Subversion (client library, and server (if possible) are 
> > > > > you running?
> > > > > 
> > > > > git 1.4.2.3
> > > > > subversion 1.3.2-r1
> > > > > 
> > > > > I will try upgrading to newer subverison.
> > > > 
> > > > subversion 1.4.0 didn't help
> > > > 
> > > > PS.
> > > > 
> > > > I can't find the dcommit command in git-cvs, has it 
> been removed?
> > > > if so, then the docs need an update.
> > > 
> > > You mean git-svn, right?  No, 'dcommit' has not been removed 
> > > and I have
> > > no plans to remove it.
> > 
> > hmm, its it not released yet then? I don't have it in git 1.4.2.3
> 
> Hm... guess not.  I track master on git.git.  1.4.3 should be released
> pretty soon, and should have dcommit.

OK, please add some examples on how to use dcommit.
Also, consider adding what options are supported for each command
in the COMMAND section.

> 
> > Also, I have difficulties to follow the docs on
> > http://www.kernel.org/pub/software/scm/git/docs/git-svn.html
> 
> The most-up-to-date documentation is available here:
> 
> http://git-svn.bogomips.org/git-svn.html
> 
> > Any chance you can update it with more examples?
> > Especially one that show how one can do one big initial
> > commit then merge your own changes on top of that?
> 
> Hmm.. large imports from git to svn can get confusing, and generally
> aren't very useful on the svn side since history gets flattened.
> So I generally don't recommend importing complete git histories into
> svn.

Yes, that's what I am trying to avoid below. Basically I want to commit to SVN the
whole u-boot tree as one commit up to the point where I started to do my changes.
Then I want my changes per commit on top of that. However I don't want to loose the
ability to merge/pull in future updates from denx u-boot tree.

I just don't know how to do it, the script below fails when it tries to 
pull the rest of the tree. Any ideas?

> 
> > Something like this
> > REPO="file:///tmp/SVNuboot"
> > REPO_PATH="/tmp/SVNuboot"
> > GIT_REPO="/tmp/mygituboot"
> > ORG_REPO="/usr/local/src/u-boot"
> > rm -rf "$REPO_PATH"
> > rm -rf "$GIT_REPO"
> > svnadmin create "$REPO_PATH"
> > svn mkdir -m "initial repo layout" "$REPO"/trunk 
> "$REPO"/branches "$REPO"/tags
> > mkdir -p "$GIT_REPO"
> > cd "$GIT_REPO"
> > git-svn init "$REPO"/trunk
> > echo  [user] >> .git/config
> > echo  name="jocke" >> .git/config
> > echo  email="Joakim.Tjernlund@transmode.se" >> .git/config
> > git-svn fetch
> > git checkout -b svn-branch remotes/git-svn
> > git-fetch "$ORG_REPO" tmcu2:tmcu
> > git-branch initial-uboot f5e0d03970409feb3c77ab0107d5dece6b7d45c9
> > git pull . initial-uboot
> > # --squash makes one large commit.
> > git pull --squash . initial-uboot
> > cg-commit -m "merge up to f5e0d03970409feb3c77ab0107d5dece6b7d45c9"
> > git-svn commit -q remotes/git-svn..svn-branch
> > git pull . tmcu # This doesn't work, I get merge conflicts
> > git-svn commit -q remotes/git-svn..svn-branch
> > 
> > Anyhow, I am glad to report that after applying your patch all my
> > problems with went away, no more Too many open file desc,  memory
> > alloc failed or Inappropriate ioctl for device, Thanks a lot.
> 
> Cool, good to know.  It seems like the apply_textdelta returning undef
> was a result of memory allocation failures, then.

Or possibly the older subversion I used(1.3.2), now I am on 1.4.0