From: "Joakim Tjernlund" <joakim.tjernlund@transmode.se>
To: "'Eric Wong'" <normalperson@yhbt.net>
Cc: <git@vger.kernel.org>
Subject: RE: git-svn and u-boot broken.
Date: Sun, 15 Oct 2006 02:39:25 +0200 [thread overview]
Message-ID: <00fa01c6eff2$5d7f8480$1267a8c0@Jocke> (raw)
In-Reply-To: <20061014210920.GD29149@localdomain>
>
> 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
next prev parent reply other threads:[~2006-10-15 0:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-14 13:13 git-svn and u-boot broken Joakim Tjernlund
2006-10-14 21:09 ` Eric Wong
2006-10-15 0:39 ` Joakim Tjernlund [this message]
2006-10-15 1:48 ` Eric Wong
2006-10-15 2:10 ` Joakim Tjernlund
-- strict thread matches above, loose matches on Subject: below --
2006-10-15 22:09 Joakim Tjernlund
2006-10-16 3:47 ` Eric Wong
2006-10-16 10:06 ` Joakim Tjernlund
2006-10-13 19:19 Joakim Tjernlund
2006-10-13 19:39 ` Randal L. Schwartz
2006-10-13 19:43 ` Joakim Tjernlund
2006-10-14 1:21 ` Joakim Tjernlund
2006-10-14 6:28 ` Eric Wong
2006-10-14 9:51 ` Joakim Tjernlund
2006-10-14 22:46 ` Eric Wong
2006-10-14 22:48 ` [PATCH] git-svn: reduce memory usage for large commits Eric Wong
2006-10-14 23:54 ` git-svn and u-boot broken Joakim Tjernlund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='00fa01c6eff2$5d7f8480$1267a8c0@Jocke' \
--to=joakim.tjernlund@transmode.se \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).