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

Re: subversion-1.8.0-rc2: diff_test 60 fails

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 23 May 2013 11:34:45 +0100

Tobias Bading <tbading_at_web.de> writes:

> However, once I execute "[...]/svn revert -R .", "[...]/svn update",
> and "[...]/svn update -r2" in the working copy, the merge works just
> fine afterwards. And that "update -r2" is exactly what
> no_spurious_conflict in diff_tests.py does before the faulty merge, if
> I'm reading the code correctly.

Yes, the test is doing an update to r2.

The double update should be an overall no-op, but it is making a
difference. You have to compare the working copy before and after the
double update and determine what has changed. One would expect the
timestamp of 3449_spurious to get changed by the double update, does
anything else change? Does the text of 3449_spurious change? Does the
output of

 svn info 3449_spurious

change? Does the output of

  svn pl -v

change? Try running

sqlite3 .svn/wc.db "select * from nodes order by local_relpath"
sqlite3 .svn/wc.db "select * from actual_node order by local_relpath"

does anything there change?

If you cannot identify what has changed perhaps you could provide a
tarball containing the repository and the broken working copy.

Certified & Supported Apache Subversion Downloads:
Received on 2013-05-23 12:35:22 CEST

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

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