[PATCH 0/2] *** SUBJECT HERE ***

[PATCH 0/2] *** SUBJECT HERE ***

[Junio C Hamano]

*** BLURB HERE ***

Junio C Hamano (1):
  Makefile: test-parse-options depends on parse-options.h

Kjetil Barvik (1):
  symlinks.c: small style cleanup

 Makefile   |    2 ++
 symlinks.c |    6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

Re: [PATCH 0/6] 'git svn info' fixes

[Eric Wong]

Thomas Rast <trast@student.ethz.ch> wrote:
> Eric Wong wrote:
> > Thomas Rast <trast@student.ethz.ch> wrote:
> > > However, the unknown files tests still fail, simply because 'svn info'
> > > itself fails on untracked files.  It would be great if someone who is
> > > still running SVN 1.4 could check whether that has been a bug in
> > > git-svn all along, or is actually a behaviour change on the part of
> > > SVN.
> > 
> > Oops, I upgraded to 1.5.x here already.  I should still have
> > another machine with 1.4 to check on tomorrow, though.
> 
> I got a friend with 1.4 to test this, and it appears the error
> 
>   $ touch new
>   $ svn info new
>   new:  (Keine versionierte Ressource)
> 
> (literally "not a versioned resource") is already present in
> 
>   $ svn --version
>   svn, Version 1.4.6 (r28521)
> 
> (He also says the error is the same if the file does not exist at
> all.)

Interesting.

> So should we just change all "unknown foo" tests to verify that 'git
> svn info' errors out too?

Yes, I see no reason to differ from plain svn here.

-- 
Eric Wong

[PATCH 0/2] *** SUBJECT HERE ***

[Thomas Rast]

Eric Wong wrote.
> > So should we just change all "unknown foo" tests to verify that 'git
> > svn info' errors out too?
>
> Yes, I see no reason to differ from plain svn here.

This starts getting more complicated at every turn.  The included
mini-series (probably textually depends on the other 6 patches though)
"fixes" this.

HOWEVER: Subversion itself broke compatibility here.  In 1.4:

  $ svn info new; echo $?
  new:  (Not a versioned resource)

  0

Note the extra linebreak and successful exit.  Current git-svn
precisely matches this output.  In 1.5, it's different:

  $ svn info new; echo $?
  svn: 'new' is not under version control
  1

While it is of course up to you what you would like to do (and modulo
test_must_fail, 2/2 can still be used to fix the tests if you decide
to reject 1/2), I suggest changing to 1.5 behaviour.  exit(1) is the
sane thing to do in this case, and that is already breaking
bit-for-bit compatibility with SVN 1.4, so we might as well adopt the
new error message.  Of course this prevents us from comparing the
output literally in the tests, so I settled for a slightly weaker
check: failure status and mention of the filename.

Unfortunately this does raise the question whether the URL-encoding
issue treated in the other series is in fact a similar incompatibility
between 1.4 and 1.5, not a (minor but long-standing) bug in git-svn.

- Thomas


 git-svn.perl            |    4 +-
 t/t9119-git-svn-info.sh |   73 ++++++++++++++++-------------------------------
 2 files changed, 27 insertions(+), 50 deletions(-)