Re: t9107-git-svn-migrate.sh fails

[Eric Wong <normalperson@yhbt.net>]

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
> 
> On Sat, 26 May 2007, Eric Wong wrote:
> 
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > 
> > > I recently wanted to use git-svn, and installed the svn perl bindings. 
> > > Since then, t9107 is failing:
> > > 
> > > -- snip --
> > > [...]
> > > Rebuilding .git/svn/git-svn/.rev_db.f944dda1-3e31-0410-9475-8f268450faf6 
> > > ...
> > > r1 = b9b82a419abdbb54f51a41bc8a3118b28c791ac1
> > > Done rebuilding 
> > > .git/svn/git-svn/.rev_db.f944dda1-3e31-0410-9475-8f268450faf6
> > > diff --git 
> > > a/home/gene099/my/git/t/trash/.git/svn/trunk/.rev_db.f944dda1-3e31-0410-9475-8f268450faf6 
> > > b/home/gene099/my/git/t/trash/.git/svn/trunk/.rev_db
> > > index d3f1b6e..01d8afd 100644
> > > --- 
> > > a/home/gene099/my/git/t/trash/.git/svn/trunk/.rev_db.f944dda1-3e31-0410-9475-8f268450faf6
> > > +++ b/home/gene099/my/git/t/trash/.git/svn/trunk/.rev_db
> > > @@ -1,2 +1 @@
> > > -0000000000000000000000000000000000000000
> > > -6aa651a66730888e854a8de54199d62ffa402739
> > > +.rev_db.f944dda1-3e31-0410-9475-8f268450faf6
> > > \ No newline at end of file
> > > * FAIL 7: .rev_db auto-converted to .rev_db.UUID
> > > 
> > >                 git-svn fetch -i trunk &&
> > > 		[...]
> > > -- snap --
> > > 
> > > Usually I try to fix things like this myself, but I really have to get 
> > > some dinner now. Besides, other people than me seem to be way more clever 
> > > with perl code.
> > 
> > .git/svn/trunk/.rev_db should be
> > a symlink to
> > .git/svn/trunk/.rev_db.f944dda1-3e31-0410-9475-8f268450faf6
> > 
> > I keep .rev_db around as a symlink for backwards compatibility in case
> > the user wants to downgrade.
> > 
> > I'm running cmp(1) to compare the file and symlink.  Are you running
> > diff2[1] replacements in your tree and it's not understanding symlinks?
> 
> D'oh!
> 
> Yes, I did a wholesale replacement of all cmp and diff invocations to 
> git-diff.
> 
> Two thoughts:
> 
> 	- why don't you check it with readlink?

I'm not sure about the portability of readlink(1).  cmp(1) is used in
several places already, whereas readlink(1) is not.

> 	- git diff should really output something when a file is compared 
> 		to a symlink...
> 
> I guess the second is something for my TODO list.
> 
> > > Anybody knows how to fix this?
> > 
> > Works for me(TM).
> 
> Changing the check back to cmp make it work here, too.
> 
> > [1] - I think that's what you called it.  I have had trouble keeping
> > up-to-date with git things lately.
> 
> Yep, I called it diff2. But we found out that we can DWIM git-diff to do 
> it; if in doubt, just say "git diff --no-index".

Cool :)

-- 
Eric Wong