git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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: Mon, 16 Oct 2006 12:06:26 +0200	[thread overview]
Message-ID: <453359A2.5090704@transmode.se> (raw)
In-Reply-To: <20061016034736.GA8782@localdomain>

Eric Wong wrote:
[SNIP]
> 
> Using -q suppresses potentially useful information.  I wouldn't use
> it if you're not sure about what you're doing.

OK.

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

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
could not make it work.

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

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

  reply	other threads:[~2006-10-16 10:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-15 22:09 git-svn and u-boot broken Joakim Tjernlund
2006-10-16  3:47 ` Eric Wong
2006-10-16 10:06   ` Joakim Tjernlund [this message]
2006-10-16 18:31     ` [RFH] git-svn documentation [was Re: git-svn and u-boot broken] Eric Wong
2006-10-16 21:44       ` Joakim Tjernlund
2006-10-18 17:22       ` [RFH] git-svn documentation Seth Falcon
  -- strict thread matches above, loose matches on Subject: below --
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
2006-10-15  1:48     ` Eric Wong
2006-10-15  2:10       ` 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 23:54           ` 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=453359A2.5090704@transmode.se \
    --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).