From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Joakim Tjernlund" <joakim.tjernlund@transmode.se>
Subject: RE: git-svn and u-boot broken.
Date: Sun, 15 Oct 2006 02:39:25 +0200
Message-ID: <00fa01c6eff2$5d7f8480$1267a8c0@Jocke>
References: <20061014210920.GD29149@localdomain>
Mime-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: <git@vger.kernel.org>
X-From: git-owner@vger.kernel.org Sun Oct 15 02:41:43 2006
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1GYu4N-0005Cf-Om
	for gcvg-git@gmane.org; Sun, 15 Oct 2006 02:41:36 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752315AbWJOAld (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Sat, 14 Oct 2006 20:41:33 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752312AbWJOAld
	(ORCPT <rfc822;git-outgoing>); Sat, 14 Oct 2006 20:41:33 -0400
Received: from 147.175.241.83.in-addr.dgcsystems.net ([83.241.175.147]:4384
	"EHLO tmnt04.transmode.se") by vger.kernel.org with ESMTP
	id S1751452AbWJOAlc (ORCPT <rfc822;git@vger.kernel.org>);
	Sat, 14 Oct 2006 20:41:32 -0400
Received: from Jocke ([84.217.9.178]) by tmnt04.transmode.se with Microsoft SMTPSVC(5.0.2195.6713);
	 Sun, 15 Oct 2006 02:41:31 +0200
To: "'Eric Wong'" <normalperson@yhbt.net>
X-Mailer: Microsoft Office Outlook 11
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2962
Thread-Index: Acbv1QsaKH/KPubdTqqgxZXOu34C1QAGgOdg
In-Reply-To: <20061014210920.GD29149@localdomain>
X-OriginalArrivalTime: 15 Oct 2006 00:41:31.0137 (UTC) FILETIME=[A84CD710:01C6EFF2]
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/28899>

> 
> 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

Also, I have difficulties to follow the docs on http://www.kernel.org/pub/software/scm/git/docs/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?

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.

 Jocke