[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 1.5.1(x) regression bug with mergeinfo

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 27 Aug 2008 15:22:08 -0400

Alexander Kitaev wrote:
> Hello,
>
> Please find reproduction script for the bug attached. It does work with
> Subversion 1.5.0 (displays merge history) and doesn't work with
> Subversion 1.5.1 and 1.5.x (r32765).

I think there are a two of problems here. First, this merge:

   ${SVN} merge -r3:4 ${URL}/branches/branch/file.txt trunk-wc/file_copy.txt

seems to produce mergeinfo like so:

   /branches/branch/file.txt:4
   /branches/branch/file_copy.txt:4

Why? The source of the merge was file.txt -- why does file_copy.txt get a
listing here?

Secondly, this bogus file_copy.txt mergeinfo source causes the nested call
to do_logs() during 'svn log -g' to raise an FS_NOT_FOUND error. That's by
design. But what might *not* be by design is that this error -- raised due
to problems with exactly one path out of several -- is preventing the
handling of the rest of the paths.

I'll open an issue or two for this. Thanks, Alexander.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-08-27 21:22:26 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.