[PATCH] issue #3469: tree conflict under a directory external

2011-03-26 Thread Daniel Shahaf
Issue #3469 is about having merge pull in the addition of A/mu when A/ is an external. (File modifications work and raise a tree conflict.) The following patch attempts to address it by having merge_file_added() skip the addition of files under a directory external. Thoughts or +1's? Daniel [[

Re: svn commit: r1084138 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/libsvn_diff/parse-diff-test.c

2011-03-26 Thread Daniel Näslund
On Sun, Mar 26, 2000 at 10:27:38AM +0200, Daniel Shahaf wrote: > You can declare VALID_HEADER_FILE in the do{} loop's scope. (I spotted > this because the double initialization stood out.) > > dan...@apache.org wrote on Tue, Mar 22, 2011 at 11:19:44 -: > > Author: dannas > > Date: Tue Mar 22

Re: Performance benchmarks

2011-03-26 Thread Mark Phippard
On Fri, Mar 25, 2011 at 1:33 PM, Mark Phippard wrote: > I have been working on a framework for writing tests to record > performance.  I have something good enough to share: > > https://ctf.open.collab.net/sf/projects/csvn > > It is pretty easy to add new tests if you have ideas on more tests you

Setting up svnserver with SASL

2011-03-26 Thread Robert Schwalbe
I cross posted this message this past week to us...@subversion.apache.org without it garnering any attention. Please have some leniency to the cross posting - I'm hoping the technical knowledge of this membership might prove more insightful. -- I'm attempting to setup svnserver with SASL on Ma

API policy (was: svn commit: r1081528 ...)

2011-03-26 Thread Greg Stein
On Mar 14, 2011 7:32 PM, wrote: > > Author: hwright > Date: Mon Mar 14 19:32:04 2011 > New Revision: 1081528 > > URL: http://svn.apache.org/viewvc?rev=1081528&view=rev > Log: > Fix the svnversion test 1 failure introduced in r1081510. This involves > exposing the wc_db txn handler to the larger l

Re: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-03-26 Thread Greg Stein
On Mar 14, 2011 5:24 PM, wrote: > > Author: stsp > Date: Mon Mar 14 17:24:05 2011 > New Revision: 1081484 > > URL: http://svn.apache.org/viewvc?rev=1081484&view=rev > Log: > In the revision status code, use a query to determine whether property > modifications are present in the WC, instead of cal

RE: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-03-26 Thread Greg Stein
If it only needs to detect a single row, then LIMIT 1 should be in the query. On Mar 26, 2011 8:06 AM, "Bert Huijben" wrote: > The current query can stop at the first result while count() needs all > results. > > Bert Huijben (Cell phone) From: Daniel Shahaf > Sent: zaterdag 26 maart 2011 8:12 > T

failed on zlib when build svn on Windows

2011-03-26 Thread Justin Peng
Hi, everyone. Now I have been in trouble with building SVN on windows. After hours work, I'v found there are some out-of-date part in the current install and it's not easy a new comer to build it on Windows. Now I'm perplexed by "msdev subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32 Relea

Re: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-03-26 Thread Daniel Shahaf
Bert Huijben wrote on Sat, Mar 26, 2011 at 01:06:10 -0700: > The current query can stop at the first result while count() needs all > results. > SELECT COUNT(local_relpath) > 0 ...; ? > Bert Huijben (Cell phone) From: Daniel Shahaf > Sent: zaterdag 26 maart 2011 8:12 > To: dev@subversion.apache

RE: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-03-26 Thread Bert Huijben
The current query can stop at the first result while count() needs all results. Bert Huijben (Cell phone) From: Daniel Shahaf Sent: zaterdag 26 maart 2011 8:12 To: dev@subversion.apache.org Cc: comm...@subversion.apache.org Subject: Re: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn

Re: svn commit: r1084138 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/libsvn_diff/parse-diff-test.c

2011-03-26 Thread Daniel Shahaf
You can declare VALID_HEADER_FILE in the do{} loop's scope. (I spotted this because the double initialization stood out.) dan...@apache.org wrote on Tue, Mar 22, 2011 at 11:19:44 -: > Author: dannas > Date: Tue Mar 22 11:19:44 2011 > New Revision: 1084138 > > URL: http://svn.apache.org/viewv

Re: svn commit: r1081528 [1/2] - in /subversion/trunk/subversion/libsvn_wc: wc_db.c wc_db_pristine.c wc_db_private.h wc_db_txn.c

2011-03-26 Thread Daniel Shahaf
log msg += wc_db_pristine.c hwri...@apache.org wrote on Mon, Mar 14, 2011 at 19:32:04 -: > Author: hwright > Date: Mon Mar 14 19:32:04 2011 > New Revision: 1081528 > > URL: http://svn.apache.org/viewvc?rev=1081528&view=rev > Log: > Fix the svnversion test 1 failure introduced in r1081510. Th

Re: svn commit: r1081484 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-03-26 Thread Daniel Shahaf
s...@apache.org wrote on Mon, Mar 14, 2011 at 17:24:06 -: > Author: stsp > Date: Mon Mar 14 17:24:05 2011 > New Revision: 1081484 > > URL: http://svn.apache.org/viewvc?rev=1081484&view=rev > Log: > In the revision status code, use a query to determine whether property > modifications are prese