Re: git-svn set-tree bug

From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Jun 10, 2007, 17:21 UTC
Message-ID: <1181496086.30670.115.camel@gentoo-jocke.transmode.se>
In-Reply-To: <20070610014734.GA542@muzzle>

On Sat, 2007-06-09 at 18:47 -0700, Eric Wong wrote:

Show 9 quoted lines

> Joakim Tjernlund <joakim.tjernlund@transmode.se> wrote:
> > trying to do git-svn set-tree remotes/trunk..svn
> > in my new git-svn repo I get:
> > config --get svn-remote.svn.fetch :refs/remotes/git-svn$: command returned error: 1
> 
> You need to specify "-i trunk" in the command-line
> 
> git-svn set-tree -i trunk remotes/trunk..svn
>

Thanks

I have found a bug or two. Run this script and see what happens ant the end. rm -rf mygitsvn rm -rf mysvnrepo rm -rf mysvnwork mkdir mysvnrepo cd mysvnrepo svnadmin create . cd .. svn checkout file:///$PWD/mysvnrepo mysvnwork mkdir -p mysvnwork/trunk cd mysvnwork/ cat << EOF > trunk/README # # (C) Copyright 2000 - 2005 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this # project. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA #

EOF

svn add trunk svn ci -m "first commit" trunk cd .. git-svn clone file:///$PWD/mysvnrepo -t tags -T trunk -b branches mygitsvn cd mygitsvn

git checkout --track -b svn remotes/trunk git checkout -b merge echo new file > new_file git add new_file git commit -a -m "New file"

echo hello >> README git commit -a -m "hello"

echo add some stuff >> new_file git commit -a -m "add some stuff"

git checkout svn mv -f README tmp echo friend > README cat tmp >> README git commit -a -m "friend" git pull . merge git svn dcommit # this fails git svn rebase # this fails too, mismerges the last commit and remove the merge commit