From commits-returnsarah76@example.org Wed Dec 01 00:16:47 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 54077 invoked from network); 1 Dec 2010 00:16:46 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 00:16:46 -0000 Received: (qmail 76197 invoked by uid 500); 1 Dec 2010 00:16:46 -0000 Delivered-To: sarah76@example.org Received: (qmail 76175 invoked by uid 500); 1 Dec 2010 00:16:46 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 76168 invoked by uid 99); 1 Dec 2010 00:16:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 00:16:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 00:16:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EA96423888CF; Wed, 1 Dec 2010 00:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040832 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Date: Wed, 01 Dec 2010 00:15:11 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Wed Dec 1 00:15:11 2010 New Revision: 1040832 URL: http://svn.apache.org/viewvc?rev=1040832&view=rev Log: Port (not merge) a fix for a FSFS packing race condition from the performance branch to /trunk: There is a slight time window between finding the name of a rev file and actually open it. If the revision in question gets packed just within this window, we will find the new (and final) file name with just one retry. * subversion/libsvn_fs_fs/fs_fs.c (open_pack_or_rev_file): retry once upon "missing file" error Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1040832&r1=1040831&r2=1040832&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original) +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Dec 1 00:15:11 2010 @@ -1903,21 +1903,42 @@ open_pack_or_rev_file(apr_file_t **file, { svn_error_t *err; const char *path; + svn_boolean_t retry = FALSE; - err = svn_fs_fs__path_rev_absolute(&path, fs, rev, pool); + do + { + err = svn_fs_fs__path_rev_absolute(&path, fs, rev, pool); - if (! err) - err = svn_io_file_open(file, path, - APR_READ | APR_BUFFERED, APR_OS_DEFAULT, pool); + /* open the revision file in buffered r/o mode */ + if (! err) + err = svn_io_file_open(file, path, + APR_READ | APR_BUFFERED, APR_OS_DEFAULT, pool); - if (err && APR_STATUS_IS_ENOENT(err->apr_err)) - { - svn_error_clear(err); - return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL, - _("No such revision %ld"), rev); + if (err && APR_STATUS_IS_ENOENT(err->apr_err)) + { + /* Could not open the file. This may happen if the + * file once existed but got packed later. */ + svn_error_clear(err); + + /* if that was our 2nd attempt, leave sarah76@example.org. */ + if (retry) + return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL, + _("No such revision %ld"), rev); + + /* we failed for the first time. Refresh cache & retry. */ + SVN_ERR(update_min_unpacked_rev(fs, pool)); + + retry = TRUE; + } + else + { + /* the file exists but something prevented us from opnening it */ + return svn_error_return(err); + } } + while (err); - return svn_error_return(err); + return SVN_NO_ERROR; } /* Given REV in FS, set *REV_OFFSET to REV's offset in the packed file. From commits-returnsarah76@example.org Wed Dec 01 03:43:02 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 36061 invoked from network); 1 Dec 2010 03:43:01 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 03:43:01 -0000 Received: (qmail 28249 invoked by uid 500); 1 Dec 2010 03:43:01 -0000 Delivered-To: sarah76@example.org Received: (qmail 28150 invoked by uid 500); 1 Dec 2010 03:43:01 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 28127 invoked by uid 99); 1 Dec 2010 03:43:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 03:43:00 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO out1.smtp.messagingengine.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 03:42:51 +0000 Received: from compute1.internal (compute1.nyi.mail.srv.osa [83.161.120.155]) by gateway1.messagingengine.com (Postfix) with ESMTP id 914BE760; Tue, 30 Nov 2010 22:42:30 -0500 (EST) Received: from frontend2.messagingengine.com ([83.161.120.155]) by compute1.internal (MEProxy); Tue, 30 Nov 2010 22:42:30 -0500 X-Sasl-enc: WaHyyEM5qPROn2FnMHYl4k+ArX4yDe1P0hTg/hjS5g+me7bdSLql1S+1pDoBqA 1291174950 Received: from daniel3.local (bzq-79-180-20-182.red.bezeqint.net [83.161.120.155]) by mail.messagingengine.com (Postfix) with ESMTPSA id B75EE5E5FAC; Tue, 30 Nov 2010 22:42:29 -0500 (EST) Date: Wed, 1 Dec 2010 05:41:06 +0200 From: Daniel Shahaf <sarah76@example.org> To: sarah76@example.org Cc: sarah76@example.org Subject: Re: svn commit: r1040663 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c Message-ID: <sarah76@example.org> References: <sarah76@example.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <sarah76@example.org> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Checked: Checked by ClamAV on apache.org sarah76@example.org wrote on Tue, Nov 30, 2010 at 18:07:52 -0000: > + /* Remove each remaining pristine that is listed in SHA1S. */ > + for (hi = apr_hash_first(scratch_pool, sha1s); > + hi; hi = apr_hash_next(hi)) > + { > + const unsigned char *sha1_digest = svn__apr_hash_index_key(hi); > + const svn_checksum_t *sha1_checksum > + = svn_checksum__from_digest(sha1_digest, svn_checksum_sha1, > + scratch_pool); > + > + SVN_ERR(pristine_remove(pdh, sha1_checksum, scratch_pool)); > + } So we loop over the remaining sha1's and remove each of them... I wonder if there is room for further optimization here? e.g., does this prepare/reset the statement just once, or once per iteration? Daniel (I hope the question makes sense --- I'm not very familiar with the svn_sqlite__* API) From commits-returnsarah76@example.org Wed Dec 01 11:31:57 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 49186 invoked from network); 1 Dec 2010 11:31:57 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 11:31:57 -0000 Received: (qmail 59014 invoked by uid 500); 1 Dec 2010 11:31:56 -0000 Delivered-To: sarah76@example.org Received: (qmail 58918 invoked by uid 500); 1 Dec 2010 11:31:56 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 58911 invoked by uid 99); 1 Dec 2010 11:31:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 11:31:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 11:31:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 96C5023889B3; Wed, 1 Dec 2010 11:30:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040959 - /subversion/trunk/tools/dev/unix-build/Makefile.svn Date: Wed, 01 Dec 2010 11:30:23 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: artagnon Date: Wed Dec 1 11:30:23 2010 New Revision: 1040959 URL: http://svn.apache.org/viewvc?rev=1040959&view=rev Log: Makefile.svn: Optionally allow building with threading support * tools/dev/unix-build/Makefile.svn: Add new THREADING variable to control whether APR and Sqlite should be built with threading support. Approved by: stsp Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1040959&r1=1040958&r2=1040959&view=diff ============================================================================== --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Dec 1 11:30:23 2010 @@ -233,6 +233,12 @@ $(APR_OBJDIR)/.retrieved: fi touch $@ +ifdef THREADING +THREADS_FLAG=--enable-threads +else +THREADS_FLAG=--disable-threads +endif + # configure apr $(APR_OBJDIR)/.configured: $(APR_OBJDIR)/.retrieved cp $(APR_SRCDIR)/build/apr_hints.m4 \ @@ -246,7 +252,7 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR) $(APR_SRCDIR)/configure \ --prefix=$(PREFIX)/apr \ --enable-maintainer-mode \ - --disable-threads + $(THREADS_FLAG) touch $@ # compile apr @@ -704,6 +710,12 @@ $(SQLITE_OBJDIR)/.retrieved: $(DISTDIR)/ tar -C $(SRCDIR) -zxf $(DISTDIR)/$(SQLITE_DIST) touch $@ +ifdef THREADING +THREADSAFE_FLAG=--enable-threadsafe +else +THREADSAFE_FLAG=--disable-threadsafe +endif + # configure sqlite $(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved cd $(SQLITE_OBJDIR) \ @@ -711,7 +723,7 @@ $(SQLITE_OBJDIR)/.configured: $(SQLITE_O $(SQLITE_SRCDIR)/configure \ --prefix=$(PREFIX)/sqlite \ --disable-tcl \ - --disable-threadsafe + $(THREADSAFE_FLAG) touch $@ # compile sqlite From commits-returnsarah76@example.org Wed Dec 01 11:38:00 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 50891 invoked from network); 1 Dec 2010 11:38:00 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 11:38:00 -0000 Received: (qmail 69444 invoked by uid 500); 1 Dec 2010 11:38:00 -0000 Delivered-To: sarah76@example.org Received: (qmail 69351 invoked by uid 500); 1 Dec 2010 11:38:00 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 69344 invoked by uid 99); 1 Dec 2010 11:37:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 11:37:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 11:37:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DCC0C23889B3; Wed, 1 Dec 2010 11:36:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040962 - /subversion/trunk/contrib/hook-scripts/README Date: Wed, 01 Dec 2010 11:36:24 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Wed Dec 1 11:36:24 2010 New Revision: 1040962 URL: http://svn.apache.org/viewvc?rev=1040962&view=rev Log: * contrib/hook-scripts/README: Delete, it contains no useful information. Removed: subversion/trunk/contrib/hook-scripts/README From commits-returnsarah76@example.org Wed Dec 01 13:05:06 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 85998 invoked from network); 1 Dec 2010 13:05:06 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 13:05:06 -0000 Received: (qmail 200 invoked by uid 500); 1 Dec 2010 13:05:06 -0000 Delivered-To: sarah76@example.org Received: (qmail 101 invoked by uid 500); 1 Dec 2010 13:05:06 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 99987 invoked by uid 99); 1 Dec 2010 13:05:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:05:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:05:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A49E723888E4; Wed, 1 Dec 2010 13:03:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1040663 - svn:log Date: Wed, 01 Dec 2010 13:03:33 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: julianfoad Revision: 1040663 Modified property: svn:log Modified: svn:log at Wed Dec 1 13:03:33 2010 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Dec 1 13:03:33 2010 @@ -1,6 +1,16 @@ -Speed up the pristine store garbage collection done by "svn cleanup". In a -trunk svn WC on my system, this reduces the overall "svn cleanup" time from -about 1 second to about 0.2 seconds for a no-op cleanup with a hot cache. +Speed up the pristine store garbage collection done by "svn cleanup" by +reducing the algorithm from quadratic to linear time in the number of +pristine texts. + +This reduces the overall time for a no-op "svn cleanup" massively for large +WCs: + + WC with 1766 pristines, 2031 NODES table rows (^/subversion/trunk) + reduced from 1 second to 0.2 seconds + WC with 14838 pristines, 78245 NODES table rows (^/subversion/branches) + reduced from 15 MINUTES to 0.7 seconds + +(Times quoted above are the best among several trials, on my Linux system.) * subversion/libsvn_wc/wc_db.c (svn_wc__db_pristine_cleanup): Instead of using a separate query to check From commits-returnsarah76@example.org Wed Dec 01 13:06:37 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 93745 invoked from network); 1 Dec 2010 13:06:37 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 13:06:37 -0000 Received: (qmail 1005 invoked by uid 500); 1 Dec 2010 13:06:36 -0000 Delivered-To: sarah76@example.org Received: (qmail 909 invoked by uid 500); 1 Dec 2010 13:06:36 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 880 invoked by uid 99); 1 Dec 2010 13:06:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:06:36 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail-ww0-f41.google.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:06:26 +0000 Received: by wwi18 with SMTP id 18so996608wwi.4 for <multiple recipients>; Wed, 01 Dec 2010 05:06:06 -0800 (PST) Received: by 83.161.120.155 with SMTP id u9mr9277990wbw.182.1291208766374; Wed, 01 Dec 2010 05:06:06 -0800 (PST) Received: from [83.161.120.155] (83.161.120.155.in-addr.arpa [83.161.120.155]) by mx.google.com with ESMTPS id f31sm3594154wej.15.283.161.120.155.06.05 (version=SSLv3 cipher=RC4-MD5); Wed, 01 Dec 2010 05:06:05 -0800 (PST) Subject: Re: svn commit: r1040663 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c From: Julian Foad <sarah76@example.org> To: Daniel Shahaf <sarah76@example.org> Cc: sarah76@example.org, sarah76@example.org In-Reply-To: <sarah76@example.org> References: <sarah76@example.org> <sarah76@example.org> Content-Type: text/plain; charset="UTF-8" Date: Wed, 01 Dec 2010 13:06:04 +0000 Message-ID: <1291208764.3782.3435.camel@edith> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Daniel Shahaf wrote: > So we loop over the remaining sha1's and remove each of them... > I wonder if there is room for further optimization here? e.g., does > this prepare/reset the statement just once, or once per iteration? Each iteration of this loop prepares, uses and resets a SQL statement, and also removes a pristine file from disk. So yes there is room for further optimization of the SQL part of that. The main concern I was addressing was that the previous method was *quadratic* in the total number of pristines in the store, because for each one in the store it would scan the NODES and ACTUAL_NODE tables looking for a reference to it. I had noticed that even a no-op cleanup took a very long time on a large WC. It will help if I show some real timings. Wall clock times for "svn cleanup" on a clean checkout of ^/subversion/branches@1040943 on my Linux system. r1040662 build: first time = 15 minutes, second = 14.8 minutes. r1040663 build: first time = 4.4s, best of many repetitions = 0.7s. Now the algorithm is only linear time, which is a *huge* win. A 'cleanup' operation doesn't need to be blisteringly fast, so I don't think it needs more optimisation. I've edited the log message to clarify the main point, and to point out the big-WC timing improvement. - Julian # r1040662 build $ time ~/build/subversion-c/subversion/svn/svn cleanup branches/ real 15m4.962s user 9m0.306s sys 6m3.967s # r1040663 build $ time ~/build/subversion-c/subversion/svn/svn cleanup branches/ real 0m0.708s user 0m0.436s sys 0m0.212s From commits-returnsarah76@example.org Wed Dec 01 13:31:11 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 98957 invoked from network); 1 Dec 2010 13:31:11 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 13:31:11 -0000 Received: (qmail 49820 invoked by uid 500); 1 Dec 2010 13:31:11 -0000 Delivered-To: sarah76@example.org Received: (qmail 49376 invoked by uid 500); 1 Dec 2010 13:31:10 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 49361 invoked by uid 99); 1 Dec 2010 13:31:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:31:09 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO out1.smtp.messagingengine.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:31:00 +0000 Received: from compute2.internal (compute2.nyi.mail.srv.osa [83.161.120.155]) by gateway1.messagingengine.com (Postfix) with ESMTP id EDA2A5DF; Wed, 1 Dec 2010 08:30:39 -0500 (EST) Received: from frontend2.messagingengine.com ([83.161.120.155]) by compute2.internal (MEProxy); Wed, 01 Dec 2010 08:30:39 -0500 X-Sasl-enc: kXcpHTbmyG8qv8HlMx/66cAOhkBnmim0KD3ufsG4nxSceomq0quXliyOGoHhqA 1291210239 Received: from daniel3.local (bzq-79-180-20-182.red.bezeqint.net [83.161.120.155]) by mail.messagingengine.com (Postfix) with ESMTPSA id 950F75E44CE; Wed, 1 Dec 2010 08:30:38 -0500 (EST) Date: Wed, 1 Dec 2010 15:29:14 +0200 From: Daniel Shahaf <sarah76@example.org> To: Julian Foad <sarah76@example.org> Cc: sarah76@example.org, sarah76@example.org Subject: Re: svn commit: r1040663 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c Message-ID: <sarah76@example.org> References: <sarah76@example.org> <sarah76@example.org> <1291208764.3782.3435.camel@edith> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1291208764.3782.3435.camel@edith> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Checked: Checked by ClamAV on apache.org Julian Foad wrote on Wed, Dec 01, 2010 at 13:06:04 +0000: > Daniel Shahaf wrote: > > So we loop over the remaining sha1's and remove each of them... > > I wonder if there is room for further optimization here? e.g., does > > this prepare/reset the statement just once, or once per iteration? > > Each iteration of this loop prepares, uses and resets a SQL statement, > and also removes a pristine file from disk. So yes there is room for > further optimization of the SQL part of that. > Thanks for the overview. > The main concern I was addressing was that the previous method was > *quadratic* in the total number of pristines in the store, because for > each one in the store it would scan the NODES and ACTUAL_NODE tables > looking for a reference to it. I had noticed that even a no-op cleanup > took a very long time on a large WC. It will help if I show some real > timings. > > Wall clock times for "svn cleanup" on a clean checkout of > ^/subversion/branches@1040943 on my Linux system. > > r1040662 build: first time = 15 minutes, second = 14.8 minutes. > > r1040663 build: first time = 4.4s, best of many repetitions = 0.7s. > :-)! > Now the algorithm is only linear time, which is a *huge* win. A > 'cleanup' operation doesn't need to be blisteringly fast, so I don't > think it needs more optimisation. > > I've edited the log message to clarify the main point, and to point out > the big-WC timing improvement. > Fair enough; let's table this additional optimization for now. We can always add it later if needed (i.e., if the time spent removing unreferenced pristines should become an issue). > - Julian > > > # r1040662 build > $ time ~/build/subversion-c/subversion/svn/svn cleanup branches/ > real 15m4.962s > user 9m0.306s > sys 6m3.967s > > # r1040663 build > $ time ~/build/subversion-c/subversion/svn/svn cleanup branches/ > real 0m0.708s > user 0m0.436s > sys 0m0.212s > > > Thanks, Daniel From commits-returnsarah76@example.org Wed Dec 01 13:39:24 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 919 invoked from network); 1 Dec 2010 13:39:24 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 13:39:24 -0000 Received: (qmail 62583 invoked by uid 500); 1 Dec 2010 13:39:24 -0000 Delivered-To: sarah76@example.org Received: (qmail 62543 invoked by uid 500); 1 Dec 2010 13:39:24 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 62536 invoked by uid 99); 1 Dec 2010 13:39:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:39:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 13:39:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5703C23889DA; Wed, 1 Dec 2010 13:37:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041006 - /subversion/trunk/subversion/include/svn_client.h Date: Wed, 01 Dec 2010 13:37:51 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: julianfoad Date: Wed Dec 1 13:37:50 2010 New Revision: 1041006 URL: http://svn.apache.org/viewvc?rev=1041006&view=rev Log: * subversion/include/svn_client.h (svn_client_args_to_target_array): Update doc string to say how relative URLs are processed and clarify that URLs are canonicalized. Modified: subversion/trunk/subversion/include/svn_client.h Modified: subversion/trunk/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1041006&r1=1041005&r2=1041006&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_client.h (original) +++ subversion/trunk/subversion/include/svn_client.h Wed Dec 1 13:37:50 2010 @@ -1000,8 +1000,11 @@ svn_client_create_context(svn_client_ctx * converting them to UTF-8, followed by targets from @a known_targets * (which might come from, for example, the "--targets" command line option). * - * On each URL target, do some IRI-to-URI encoding and some auto-escaping. - * On each local path, canonicalize case and path separators. + * Process each target in one of the following ways. For a repository- + * relative URL: resolve to a full URL, contacting the repository if + * necessary to do so, and then treat as a full URL. For a URL: do some + * IRI-to-URI encoding and some auto-escaping, and canonicalize. For a + * local path: canonicalize case and path separators. * * Allocate @a *targets_p and its elements in @a pool. * From commits-returnsarah76@example.org Wed Dec 01 14:59:14 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 33972 invoked from network); 1 Dec 2010 14:59:13 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 14:59:13 -0000 Received: (qmail 99791 invoked by uid 500); 1 Dec 2010 14:59:13 -0000 Delivered-To: sarah76@example.org Received: (qmail 99689 invoked by uid 500); 1 Dec 2010 14:59:13 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 99681 invoked by uid 99); 1 Dec 2010 14:59:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 14:59:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 14:59:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E64B23888E4; Wed, 1 Dec 2010 14:57:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041033 - /subversion/branches/1.5.x/STATUS Date: Wed, 01 Dec 2010 14:57:40 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: pburba Date: Wed Dec 1 14:57:39 2010 New Revision: 1041033 URL: http://svn.apache.org/viewvc?rev=1041033&view=rev Log: * STATUS: Some votes and notes. Modified: subversion/branches/1.5.x/STATUS Modified: subversion/branches/1.5.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041033&r1=1041032&r2=1041033&view=diff ============================================================================== --- subversion/branches/1.5.x/STATUS (original) +++ subversion/branches/1.5.x/STATUS Wed Dec 1 14:57:39 2010 @@ -72,10 +72,9 @@ Candidate changes for 1.5.8: Can cause repeat merges to break in the presence of non-inheritable mergeinfo. Notes: - r877146 is a test for the issue, r877157 is the fix. There is a backport - branch at http://svn.collab.net/repos/svn/branches/1.5.x-issue3392, but - it is dependent on r876953 being merged first. (If this change *must* be - merged before r876953 I'll create a branch to do so - pburba) + r877146 is a test for the issue, r877157 is the fix. + Branch: + ^/subversion/branches/1.5.x-issue3392 Votes: +1: pburba, arfrever @@ -120,6 +119,7 @@ Candidate changes for 1.5.8: This was introduced in 1.5.1 and propagated till now. Votes: +1: stylesen + -1: pburba (This change uses a 1.6 API, svn_error_compose_create). * r878760-7 Fix serious bugs in libsvn_ra_svn and svnsync. (If svnsync errors @@ -162,6 +162,7 @@ Candidate changes for 1.5.8: files are used everywhere else in the world. Votes: +1: cmpilato + -0: this change conflicts when merged * r880082 Respect Apache's ServerSignature directive. From commits-returnsarah76@example.org Wed Dec 01 15:27:53 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 50078 invoked from network); 1 Dec 2010 15:27:53 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 15:27:53 -0000 Received: (qmail 53669 invoked by uid 500); 1 Dec 2010 15:27:53 -0000 Delivered-To: sarah76@example.org Received: (qmail 53599 invoked by uid 500); 1 Dec 2010 15:27:52 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 53592 invoked by uid 99); 1 Dec 2010 15:27:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 15:27:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 15:27:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E02A023889B3; Wed, 1 Dec 2010 15:26:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041051 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c Date: Wed, 01 Dec 2010 15:26:16 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Wed Dec 1 15:26:16 2010 New Revision: 1041051 URL: http://svn.apache.org/viewvc?rev=1041051&view=rev Log: Simplify the cleanup of unreferenced pristines by getting SQLite to calculate the list of unreferenced checksums. A follow-up to r1040663. This makes no significant speed difference in my tests. Suggested by: rhuijben * subversion/libsvn_wc/wc-queries.sql (STMT_SELECT_PRISTINE_ROWS, STMT_SELECT_ALL_PRISTINE_REFERENCES): Remove. (STMT_SELECT_UNREFERENCED_PRISTINES): New query. * subversion/libsvn_wc/wc_db.c (svn_wc__db_pristine_cleanup): Reduce to just a single loop over the unreferenced pristines. Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql subversion/trunk/subversion/libsvn_wc/wc_db.c Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1041051&r1=1041050&r2=1041051&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original) +++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Dec 1 15:26:16 2010 @@ -426,10 +426,6 @@ SELECT checksum FROM pristine WHERE md5_checksum = ?1 --- STMT_SELECT_PRISTINE_ROWS -SELECT checksum -FROM pristine - -- STMT_SELECT_ANY_PRISTINE_REFERENCE SELECT 1 FROM nodes WHERE checksum = ?1 OR checksum = ?2 @@ -440,16 +436,19 @@ SELECT 1 FROM actual_node OR right_checksum = ?1 OR right_checksum = ?2 LIMIT 1 --- STMT_SELECT_ALL_PRISTINE_REFERENCES +-- STMT_SELECT_UNREFERENCED_PRISTINES +SELECT checksum +FROM pristine +EXCEPT SELECT checksum FROM nodes WHERE checksum IS NOT NULL -UNION ALL +EXCEPT SELECT older_checksum FROM actual_node WHERE older_checksum IS NOT NULL -UNION ALL +EXCEPT SELECT left_checksum FROM actual_node WHERE left_checksum IS NOT NULL -UNION ALL +EXCEPT SELECT right_checksum FROM actual_node WHERE right_checksum IS NOT NULL Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1041051&r1=1041050&r2=1041051&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Dec 1 15:26:16 2010 @@ -2659,8 +2659,6 @@ svn_wc__db_pristine_cleanup(svn_wc__db_t svn_wc__db_pdh_t *pdh; const char *local_relpath; svn_sqlite__stmt_t *stmt; - apr_hash_t *sha1s = apr_hash_make(scratch_pool); - apr_hash_index_t *hi; SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath)); @@ -2669,28 +2667,9 @@ svn_wc__db_pristine_cleanup(svn_wc__db_t scratch_pool, scratch_pool)); VERIFY_USABLE_PDH(pdh); - /* Find all the pristines in the DB; store their SHA-1s in SHA1S. */ - SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb, - STMT_SELECT_PRISTINE_ROWS)); - while (1) - { - svn_boolean_t have_row; - const svn_checksum_t *sha1_checksum; - - SVN_ERR(svn_sqlite__step(&have_row, stmt)); - if (! have_row) - break; - - SVN_ERR(svn_sqlite__column_checksum(&sha1_checksum, stmt, 0, - scratch_pool)); - apr_hash_set(sha1s, sha1_checksum->digest, - svn_checksum_size(sha1_checksum), (void *)1); - } - SVN_ERR(svn_sqlite__reset(stmt)); - - /* Find all the referenced pristines; remove their SHA-1s from SHA1S. */ + /* Find each unreferenced pristine in the DB and remove it. */ SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb, - STMT_SELECT_ALL_PRISTINE_REFERENCES)); + STMT_SELECT_UNREFERENCED_PRISTINES)); while (1) { svn_boolean_t have_row; @@ -2702,29 +2681,9 @@ svn_wc__db_pristine_cleanup(svn_wc__db_t SVN_ERR(svn_sqlite__column_checksum(&sha1_checksum, stmt, 0, scratch_pool)); - if (sha1_checksum->kind != svn_checksum_sha1) - { - /* ### Transitional. Should no longer be possible. */ - SVN_ERR(svn_wc__db_pristine_get_sha1(&sha1_checksum, db, wri_abspath, - sha1_checksum, - scratch_pool, scratch_pool)); - } - apr_hash_set(sha1s, sha1_checksum->digest, - svn_checksum_size(sha1_checksum), NULL); - } - SVN_ERR(svn_sqlite__reset(stmt)); - - /* Remove each remaining pristine that is listed in SHA1S. */ - for (hi = apr_hash_first(scratch_pool, sha1s); - hi; hi = apr_hash_next(hi)) - { - const unsigned char *sha1_digest = svn__apr_hash_index_key(hi); - const svn_checksum_t *sha1_checksum - = svn_checksum__from_digest(sha1_digest, svn_checksum_sha1, - scratch_pool); - SVN_ERR(pristine_remove(pdh, sha1_checksum, scratch_pool)); } + SVN_ERR(svn_sqlite__reset(stmt)); return SVN_NO_ERROR; } From commits-returnsarah76@example.org Wed Dec 01 15:39:59 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 53866 invoked from network); 1 Dec 2010 15:39:59 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 15:39:59 -0000 Received: (qmail 73432 invoked by uid 500); 1 Dec 2010 15:39:59 -0000 Delivered-To: sarah76@example.org Received: (qmail 73331 invoked by uid 500); 1 Dec 2010 15:39:58 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 73324 invoked by uid 99); 1 Dec 2010 15:39:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 15:39:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 15:39:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F5A523889B2; Wed, 1 Dec 2010 15:38:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041056 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h Date: Wed, 01 Dec 2010 15:38:26 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: julianfoad Date: Wed Dec 1 15:38:25 2010 New Revision: 1041056 URL: http://svn.apache.org/viewvc?rev=1041056&view=rev Log: * subversion/libsvn_fs_fs/fs_fs.h (svn_fs_fs__path_rev_absolute): Mention that the resulting path may not remain correct if the caller does not have the write lock on FS. Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h?rev=1041056&r1=1041055&r2=1041056&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h (original) +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h Wed Dec 1 15:38:25 2010 @@ -407,8 +407,12 @@ svn_error_t *svn_fs_fs__move_into_place( const char *perms_reference, apr_pool_t *pool); -/* Sets *PATH to the path of REV in FS, whether in a pack file or not. - Allocate in POOL. */ +/* Set *PATH to the path of REV in FS, whether in a pack file or not. + Allocate *PATH in POOL. + + Note: If the caller does not have the write lock on FS, then the path is + not guaranteed to remain correct after the function returns, because the + revision might become packed just after this call. */ svn_error_t * svn_fs_fs__path_rev_absolute(const char **path, svn_fs_t *fs, From commits-returnsarah76@example.org Wed Dec 01 16:11:08 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 74279 invoked from network); 1 Dec 2010 16:11:08 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 16:11:08 -0000 Received: (qmail 46299 invoked by uid 500); 1 Dec 2010 16:11:08 -0000 Delivered-To: sarah76@example.org Received: (qmail 46193 invoked by uid 500); 1 Dec 2010 16:11:06 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 46115 invoked by uid 99); 1 Dec 2010 16:11:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 16:11:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 16:11:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E6A7A23889EA; Wed, 1 Dec 2010 16:09:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041068 - in /subversion/trunk/subversion: libsvn_client/diff.c tests/cmdline/depth_tests.py tests/cmdline/diff_tests.py Date: Wed, 01 Dec 2010 16:09:29 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kameshj Date: Wed Dec 1 16:09:29 2010 New Revision: 1041068 URL: http://svn.apache.org/viewvc?rev=1041068&view=rev Log: Fix assertion error when there is a prop diff on a dir and the diff target is implicit current working directory or URL. * subversion/tests/cmdline/diff_tests.py (diff_with_depth): Fix the expectations, not to expect ".". (diff_git_with_props_on_dir): New testcase that was triggering assertion error before this commit. (test_list): Add diff_git_with_props_on_dir. * subversion/tests/cmdline/depth_tests.py (diff_in_depthy_wc): Fix the expectations, not to expect ".". * subversion/libsvn_client/diff.c (display_prop_diffs): When path is empty let it be so. Modified: subversion/trunk/subversion/libsvn_client/diff.c subversion/trunk/subversion/tests/cmdline/depth_tests.py subversion/trunk/subversion/tests/cmdline/diff_tests.py Modified: subversion/trunk/subversion/libsvn_client/diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1041068&r1=1041067&r2=1041068&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/diff.c (original) +++ subversion/trunk/subversion/libsvn_client/diff.c Wed Dec 1 16:09:29 2010 @@ -574,10 +574,6 @@ display_prop_diffs(const apr_array_heade const char *path1 = apr_pstrdup(pool, orig_path1); const char *path2 = apr_pstrdup(pool, orig_path2); - /* If we're creating a diff on the wc root, path would be empty. */ - if (path[0] == '\0') - path = apr_psprintf(pool, "."); - if (use_git_diff_format) { SVN_ERR(adjust_relative_to_repos_root(&path1, path, orig_path1, Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1041068&r1=1041067&r2=1041068&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Wed Dec 1 16:09:29 2010 @@ -1062,12 +1062,12 @@ def diff_in_depthy_wc(sbox): "@@ -1 +1 @@\n", "-new text\n", "+This is the file 'iota'.\n", - "Index: .\n", + "Index: \n", "===================================================================\n", - "--- .\t(revision 2)\n", - "+++ .\t(working copy)\n", + "--- \t(revision 2)\n", + "+++ \t(working copy)\n", "\n", - "Property changes on: .\n", + "Property changes on: \n", "___________________________________________________________________\n", "Deleted: foo\n", "## -1 +0,0 ##\n", Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1041068&r1=1041067&r2=1041068&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed Dec 1 16:09:29 2010 @@ -2868,7 +2868,7 @@ def diff_with_depth(sbox): diff = [ "\n", - "Property changes on: .\n", + "Property changes on: \n", "___________________________________________________________________\n", "Added: foo1\n", "## -0,0 +1 ##\n", @@ -2892,7 +2892,7 @@ def diff_with_depth(sbox): "## -0,0 +1 ##\n", "+bar4\n"] - dot_header = make_diff_header(".", "revision 1", "working copy") + dot_header = make_diff_header("", "revision 1", "working copy") iota_header = make_diff_header('iota', "revision 1", "working copy") A_header = make_diff_header('A', "revision 1", "working copy") B_header = make_diff_header(B_path, "revision 1", "working copy") @@ -2939,7 +2939,7 @@ def diff_with_depth(sbox): svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m', '') - dot_header = make_diff_header(".", "revision 1", "revision 2") + dot_header = make_diff_header("", "revision 1", "revision 2") iota_header = make_diff_header('iota', "revision 1", "revision 2") A_header = make_diff_header('A', "revision 1", "revision 2") B_header = make_diff_header(B_path, "revision 1", "revision 2") @@ -3011,12 +3011,12 @@ def diff_with_depth(sbox): "## -1 +1 ##\n", "-bar2\n", "+baz2\n", - "Index: .\n", + "Index: \n", "===================================================================\n", - "--- .\t(revision 2)\n", - "+++ .\t(working copy)\n", + "--- \t(revision 2)\n", + "+++ \t(working copy)\n", "\n", - "Property changes on: .\n", + "Property changes on: \n", "___________________________________________________________________\n", "Modified: foo1\n", "## -1 +1 ##\n", @@ -3713,6 +3713,42 @@ def diff_git_with_props(sbox): svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', '--git', wc_dir) + +def diff_git_with_props_on_dir(sbox): + "diff in git format showing prop changes on dir" + sbox.build() + wc_dir = sbox.wc_dir + + # Now commit the local mod, creating rev 2. + expected_output = svntest.wc.State(wc_dir, { + '.' : Item(verb='Sending'), + }) + + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) + expected_status.add({ + '' : Item(status=' ', wc_rev=2), + }) + + svntest.main.run_svn(None, 'ps', 'a','b', wc_dir) + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status, None, wc_dir) + + was_cwd = os.getcwd() + os.chdir(wc_dir) + expected_output = make_git_diff_header("", "", "revision 1", + "revision 2", + add=False, text_changes=False) + [ + "\n", + "Property changes on: \n", + "___________________________________________________________________\n", + "Added: a\n", + "## -0,0 +1 ##\n", + "+b\n", + ] + + svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', + '-c2', '--git') + os.chdir(was_cwd) ######################################################################## #Run the tests @@ -3775,7 +3811,8 @@ test_list = [ None, diff_prop_missing_context, diff_prop_multiple_hunks, diff_git_empty_files, - diff_git_with_props, + diff_git_with_props, + diff_git_with_props_on_dir, ] if __name__ == '__main__': From commits-returnsarah76@example.org Wed Dec 01 17:16:26 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 7256 invoked from network); 1 Dec 2010 17:16:26 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 17:16:26 -0000 Received: (qmail 1870 invoked by uid 500); 1 Dec 2010 17:16:26 -0000 Delivered-To: sarah76@example.org Received: (qmail 1793 invoked by uid 500); 1 Dec 2010 17:16:25 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 1786 invoked by uid 99); 1 Dec 2010 17:16:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:16:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:16:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C25A623889F7; Wed, 1 Dec 2010 17:14:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041083 - /subversion/trunk/CHANGES Date: Wed, 01 Dec 2010 17:14:50 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Dec 1 17:14:50 2010 New Revision: 1041083 URL: http://svn.apache.org/viewvc?rev=1041083&view=rev Log: * CHANGES: Pull out my crystal ball and put a date on 1.5.8. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1041083&r1=1041082&r2=1041083&view=diff ============================================================================== --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Wed Dec 1 17:14:50 2010 @@ -444,7 +444,7 @@ http://svn.apache.org/repos/asf/subversi Version 1.5.8 -(?? ??? 2010, from /branches/1.5.x) +(03 Dec 2010, from /branches/1.5.x) http://svn.apache.org/repos/asf/subversion/tags/1.5.8 User-visible changes: From commits-returnsarah76@example.org Wed Dec 01 17:18:32 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 9206 invoked from network); 1 Dec 2010 17:18:32 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 17:18:32 -0000 Received: (qmail 12564 invoked by uid 500); 1 Dec 2010 17:18:32 -0000 Delivered-To: sarah76@example.org Received: (qmail 12529 invoked by uid 500); 1 Dec 2010 17:18:32 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 12518 invoked by uid 99); 1 Dec 2010 17:18:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:18:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:18:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EA04023888E8; Wed, 1 Dec 2010 17:16:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041089 - in /subversion/branches/1.5.x: ./ notes/tree-conflicts/ subversion/bindings/swig/ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/tests/cmdline/svntest/ www/images/ Date: Wed, 01 Dec 2010 17:16:46 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Dec 1 17:16:46 2010 New Revision: 1041089 URL: http://svn.apache.org/viewvc?rev=1041089&view=rev Log: * CHANGES: Update with 1.5.8 section. Modified: subversion/branches/1.5.x/ (props changed) subversion/branches/1.5.x/CHANGES (contents, props changed) subversion/branches/1.5.x/COMMITTERS (props changed) subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt (props changed) subversion/branches/1.5.x/subversion/bindings/swig/ (props changed) subversion/branches/1.5.x/subversion/include/private/ (props changed) subversion/branches/1.5.x/subversion/libsvn_client/merge.c (props changed) subversion/branches/1.5.x/subversion/libsvn_subr/ (props changed) subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c (props changed) subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py (props changed) subversion/branches/1.5.x/www/images/subversion-diagram.png (props changed) subversion/branches/1.5.x/www/images/subversion_logo-200x173.png (props changed) subversion/branches/1.5.x/www/images/subversion_logo-384x332.png (props changed) subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png (props changed) Propchange: subversion/branches/1.5.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -32,4 +32,4 @@ /subversion/branches/reintegrate-improvements:873853-874164 /subversion/branches/svn-mergeinfo-enhancements:870196 /subversion/branches/svnpatch-diff:871905 -/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985 8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671, 870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87 1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739 40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1033166 +/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985 8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671, 870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87 1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739 40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1033166,1038163,1041083 Modified: subversion/branches/1.5.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/CHANGES?rev=1041089&r1=1041088&r2=1041089&view=diff ============================================================================== --- subversion/branches/1.5.x/CHANGES (original) +++ subversion/branches/1.5.x/CHANGES Wed Dec 1 17:16:46 2010 @@ -1,3 +1,29 @@ +Version 1.5.8 +(03 Dec 2010, from /branches/1.5.x) +http://svn.apache.org/repos/asf/subversion/tags/1.5.8 + + User-visible changes: + * fix proxying of LOCK and UNLOCK requests with WebDAV proxies (r36159) + * improve performance of --ignore-ancestry merges (r36256) + * avoid crash with when using subtree mergeinfo (r36613, -13, -31, -41) + * improve merge correctness with non-inheritable mergeinfo (r36789) + * fixed: repeated mergeinfo of conflicting properties fails (issue #3250) + * fix segfault in wc->URL copy (r37646, -56) + * make 'svn up --set-depth infinity' expand shallow subtrees (r37169) + * make default depth of 'svn merge' infinity (r37156) + * error if attempting to reintegrate to/from the repo root (r37385) + * improve memory performance in 'svn merge' (issue #3393) + * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695) + See CVE-2010-3315, and descriptive advisory at + http://subversion.apache.org/security/CVE-2010-3315-advisory.txt + * prevent crash in mod_dav_svn when using SVNParentPath (r1033166) + + Developer-visible changes: + * fix pointer dereference (r36783) + * fix error leak (r36860) + * make basic_tests 12 compatible with Windows and Python 2.5+ (r35930) + + Version 1.5.7 (06 Aug 2009, from /branches/1.5.x) http://svn.collab.net/repos/svn/tags/1.5.7 Propchange: subversion/branches/1.5.x/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -29,4 +29,4 @@ /subversion/branches/r30963-1.5.x/CHANGES:871056-871076 /subversion/branches/svn-mergeinfo-enhancements/CHANGES:870196 /subversion/trunk:876953 -/subversion/trunk/CHANGES:836421-841355,869155-871860,871863-872360,872362,872364-872837,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873218-873643,873715,873718,873767,873778,873849,873856,873862,873914,873920-874935,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/CHANGES:836421-841355,869155-871860,871863-872360,872362,872364-872837,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873218-873643,873715,873718,873767,873778,873849,873856,873862,873914,873920-874935,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/COMMITTERS ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -29,4 +29,4 @@ /subversion/branches/r30963-1.5.x/COMMITTERS:871056-871076 /subversion/branches/svn-mergeinfo-enhancements/COMMITTERS:870196 /subversion/trunk:876953 -/subversion/trunk/COMMITTERS:836421-842826,869164,869506,870043,870331,870681,870702,870706,870809,870820-870824,870830,870886,870989,871003,871009,871023,871033,871035-871036,871041,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-8 71942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874 727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1033166 +/subversion/trunk/COMMITTERS:836421-842826,869164,869506,870043,870331,870681,870702,870706,870809,870820-870824,870830,870886,870989,871003,871009,871023,871033,871035-871036,871041,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-8 71942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874 727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -14,4 +14,4 @@ /subversion/branches/1.5.x-rb-test-fix/notes/tree-conflicts/scratch-pad.txt:874916-874919 /subversion/branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt:874586-874922 /subversion/trunk/libsvn_subr:876953 -/subversion/trunk/notes/tree-conflicts/scratch-pad.txt:836421-867527,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/notes/tree-conflicts/scratch-pad.txt:836421-867527,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/bindings/swig/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -30,4 +30,4 @@ /subversion/branches/r30963-1.5.x/subversion/bindings/swig:871056-871076 /subversion/branches/svn-mergeinfo-enhancements/subversion/bindings/swig:870196 /subversion/trunk/.x-2/.svn/dir-prop-base:876953 -/subversion/trunk/subversion/bindings/swig:836421-837142,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,8 69825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870 626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871129-871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,87167 7,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914, 873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/bindings/swig:836421-837142,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,8 69825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870 626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871129-871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,87167 7,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914, 873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/include/private/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -33,4 +33,4 @@ /subversion/branches/svn-mergeinfo-enhancements/subversion/include/private:870196 /subversion/branches/svnpatch-diff/subversion/include/private:871905 /subversion/trunk/lient/merge.c:876953 -/subversion/trunk/subversion/include/private:836421-861089,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820 ,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-8 70626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871 620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,87376 7,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/include/private:836421-861089,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820 ,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-8 70626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871 620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,87376 7,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/libsvn_client/merge.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -32,4 +32,4 @@ /subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_client/merge.c:870196 /subversion/branches/svnpatch-diff/subversion/libsvn_client/merge.c:871905 /subversion/trunk:876953 -/subversion/trunk/subversion/libsvn_client/merge.c:836421-864118,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818, 869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,87 0625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,8716 08,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873370,873443,873521,873538-873539,873715 ,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/libsvn_client/merge.c:836421-864118,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818, 869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,87 0625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,8716 08,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873370,873443,873521,873538-873539,873715 ,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/libsvn_subr/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -33,4 +33,4 @@ /subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_subr:870196 /subversion/branches/svnpatch-diff/subversion/libsvn_subr:871905 /subversion/trunk:876953 -/subversion/trunk/subversion/libsvn_subr:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869 841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,87064 7,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649, 871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,87 3856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/libsvn_subr:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869 841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,87064 7,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649, 871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,87 3856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -33,4 +33,4 @@ /subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_wc/adm_ops.c:870196 /subversion/branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c:871905 /subversion/trunk/bindings/swig:876953 -/subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,86 9837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,8706 41,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624 ,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,8 73849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,86 9837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,8706 41,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624 ,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,8 73849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -33,4 +33,4 @@ /subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/svntest/actions.py:870196 /subversion/branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py:871905 /subversion/trunk:876953 -/subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869 815-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,87062 0,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590, 871597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,87 3715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869 815-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,87062 0,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590, 871597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,87 3715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/www/images/subversion-diagram.png ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -14,4 +14,4 @@ /subversion/branches/1.5.x-rb-test-fix/www/images/subversion-diagram.png:874916-874919 /subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png:874586-874922 /subversion/trunk/MITTERS:876953 -/subversion/trunk/www/images/subversion-diagram.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/www/images/subversion-diagram.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/www/images/subversion_logo-200x173.png ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -14,4 +14,4 @@ /subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-200x173.png:874916-874919 /subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png:874586-874922 /subversion/trunk/384x332.png:876953 -/subversion/trunk/www/images/subversion_logo-200x173.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/www/images/subversion_logo-200x173.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/www/images/subversion_logo-384x332.png ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -13,4 +13,4 @@ /subversion/branches/1.5.x-r37169/www/images/subversion_logo-384x332.png:877272-878304 /subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-384x332.png:874916-874919 /subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png:874586-874922 -/subversion/trunk/www/images/subversion_logo-384x332.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/www/images/subversion_logo-384x332.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 1 17:16:46 2010 @@ -14,4 +14,4 @@ /subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo_hor-468x64.png:874916-874919 /subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png:874586-874922 /subversion/trunk:876953 -/subversion/trunk/www/images/subversion_logo_hor-468x64.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166 +/subversion/trunk/www/images/subversion_logo_hor-468x64.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1033166,1038163,1041083 From commits-returnsarah76@example.org Wed Dec 01 17:46:22 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 21113 invoked from network); 1 Dec 2010 17:46:22 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 17:46:22 -0000 Received: (qmail 83941 invoked by uid 500); 1 Dec 2010 17:46:22 -0000 Delivered-To: sarah76@example.org Received: (qmail 83922 invoked by uid 500); 1 Dec 2010 17:46:22 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 83915 invoked by uid 99); 1 Dec 2010 17:46:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:46:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 17:46:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20CF823888EA; Wed, 1 Dec 2010 17:44:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041102 - /subversion/trunk/subversion/include/svn_io.h Date: Wed, 01 Dec 2010 17:44:50 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: julianfoad Date: Wed Dec 1 17:44:49 2010 New Revision: 1041102 URL: http://svn.apache.org/viewvc?rev=1041102&view=rev Log: * subversion/include/svn_io.h (svn_io_dir_file_copy): Clarify the doc string. Modified: subversion/trunk/subversion/include/svn_io.h Modified: subversion/trunk/subversion/include/svn_io.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=1041102&r1=1041101&r2=1041102&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_io.h (original) +++ subversion/trunk/subversion/include/svn_io.h Wed Dec 1 17:44:49 2010 @@ -692,8 +692,11 @@ svn_error_t * svn_io_file_flush_to_disk(apr_file_t *file, apr_pool_t *pool); -/** Copy file @a file from location @a src_path to location @a dest_path. - * Use @a pool for memory allocations. +/** Copy the file whose basename or relative path is @a file within + * directory @a src_path to the same basename or relative path within + * directory @a dest_path. Overwrite the destination if it already + * exists. Set the destination file's permissions to match those of + * the source. Use @a pool for memory allocations. */ svn_error_t * svn_io_dir_file_copy(const char *src_path, From commits-returnsarah76@example.org Wed Dec 01 18:54:25 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 59611 invoked from network); 1 Dec 2010 18:54:25 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 18:54:25 -0000 Received: (qmail 10321 invoked by uid 500); 1 Dec 2010 18:54:25 -0000 Delivered-To: sarah76@example.org Received: (qmail 10307 invoked by uid 500); 1 Dec 2010 18:54:25 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 10300 invoked by uid 99); 1 Dec 2010 18:54:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 18:54:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 18:54:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7EB52388993; Wed, 1 Dec 2010 18:52:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041130 - in /subversion/tags/1.5.8: ./ subversion/include/svn_version.h Date: Wed, 01 Dec 2010 18:52:47 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Dec 1 18:52:47 2010 New Revision: 1041130 URL: http://svn.apache.org/viewvc?rev=1041130&view=rev Log: Tagging 1.5.8 release with svn_version.h matching tarball. Added: subversion/tags/1.5.8/ (props changed) - copied from r1041089, subversion/branches/1.5.x/ Modified: subversion/tags/1.5.8/subversion/include/svn_version.h Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Dec 1 18:52:47 2010 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ bzr:file-ids = Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- bzr:revision-id-v3:trunk0 (added) +++ bzr:revision-id-v3:trunk0 Wed Dec 1 18:52:47 2010 @@ -0,0 +1 @@ +18228 sarah76@example.org Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- bzr:revision-id:v3-trunk0 (added) +++ bzr:revision-id:v3-trunk0 Wed Dec 1 18:52:47 2010 @@ -0,0 +1,5 @@ +20214 sarah76@example.org +20235 sarah76@example.org +20236 sarah76@example.org +20244 sarah76@example.org +20248 sarah76@example.org Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- bzr:revision-info (added) +++ bzr:revision-info Wed Dec 1 18:52:47 2010 @@ -0,0 +1,5 @@ +timestamp: 2007-12-10 04:12:907.269.2580 +0100 +committer: Jelmer Vernooij <sarah76@example.org> +properties: + branch-nick: trunk + rebase-of: sarah76@example.org Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- svk:merge (added) +++ svk:merge Wed Dec 1 18:52:47 2010 @@ -0,0 +1,21 @@ +40bec6f9-eef0-0310-8400-9b45a50af7ca:/local/trunk:90 +422c9f7f-73e9-0310-916f-f579f4d99a6a:/local/pool-cleanup:1951 +5fb2e21a-203d-0410-8290-957dc927bc9b:/local/trunk:31028 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ:153289 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ-tmp:153288 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-PHL:108970 +834019e9-2104-4f97-81ba-933cb999031a:/svn/SEA-BOS:108721 +834019e9-2104-4f97-81ba-933cb999031a:/svn/dav-to-neon:151584 +834019e9-2104-4f97-81ba-933cb999031a:/svn/propedit-urls:103714 +834019e9-2104-4f97-81ba-933cb999031a:/svn/props-in-subr:102459 +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-bug:111919 +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-textdelta:108713 +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-real:113336 +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-scratch:113335 +834019e9-2104-4f97-81ba-933cb999031a:/svn/test-chdir:148259 +834019e9-2104-4f97-81ba-933cb999031a:/svn/trunk:108720 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/JFK-SFO:28628 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/NBR-PHL:28509 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/node-origins-bus:28431 +ae6c956b-9dc6-0310-97b2-e73af4192982:/svn/local:8265 +c9b7866f-f5e4-0310-b3ee-a2e1643c603f:/svn/local/new-auto-merge:10428 Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Dec 1 18:52:47 2010 @@ -0,0 +1,43 @@ +ChangeLog* +Makefile +config.cache +config.log +config.nice +config.status +configure +libtool +.gdb_history +*.orig +*.rej +TAGS +tags +neon +build-outputs.mk +autogen-standalone.mk +autom4te.cache +gen-make.opts +tests.log +db4-win32 +db +*.o +*~ +.*~ +apr +apr-util +apr-iconv +Release +Debug +subversion_msvc.dsw +subversion_msvc.ncb +subversion_msvc.opt +subversion_msvc.plg +subversion_vcnet.sln +subversion_vcnet.ncb +subversion_vcnet.suo +mkmf.log +.project +.classpath +.cdtproject +.settings +.cproject +zlib Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Dec 1 18:52:47 2010 @@ -0,0 +1,35 @@ +/subversion/branches/1.5.x-34184:874657-874741 +/subversion/branches/1.5.x-34432:874744-874798 +/subversion/branches/1.5.x-issue3067:872184-872314 +/subversion/branches/1.5.x-issue3157:872165-872175 +/subversion/branches/1.5.x-issue3174:872178-872348 +/subversion/branches/1.5.x-r30215:870310,870312,870319,870362 +/subversion/branches/1.5.x-r30756:874853-874870 +/subversion/branches/1.5.x-r30868:870951-870970 +/subversion/branches/1.5.x-r31314:874476-874605 +/subversion/branches/1.5.x-r31516:871592-871649 +/subversion/branches/1.5.x-r32470:872546-872676 +/subversion/branches/1.5.x-r32968:873773-873872 +/subversion/branches/1.5.x-r33447:873527-873547 +/subversion/branches/1.5.x-r33465:873541-873549 +/subversion/branches/1.5.x-r33641:873880-873883 +/subversion/branches/1.5.x-r34050-followups:874639-874686 +/subversion/branches/1.5.x-r34487:874562-874581 +/subversion/branches/1.5.x-r35566:875648-876172 +/subversion/branches/1.5.x-r36256:876332-877824 +/subversion/branches/1.5.x-r36613:876709-877827 +/subversion/branches/1.5.x-r36879:876973-877829 +/subversion/branches/1.5.x-r36919:876996-877831 +/subversion/branches/1.5.x-r37156:877275-878306 +/subversion/branches/1.5.x-r37169:877272-878304 +/subversion/branches/1.5.x-ra_serf-backports:872354-872626 +/subversion/branches/1.5.x-rb-test-fix:874916-874919 +/subversion/branches/1.5.x-reintegrate-improvements:874586-874922 +/subversion/branches/1.5.x-tests-pass:870925-870973 +/subversion/branches/issue-3220-dev:872210-872226 +/subversion/branches/log-g-performance:870941-871032 +/subversion/branches/r30963-1.5.x:871056-871076 +/subversion/branches/reintegrate-improvements:873853-874164 +/subversion/branches/svn-mergeinfo-enhancements:870196 +/subversion/branches/svnpatch-diff:871905 +/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985 8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671, 870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87 1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739 40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1033166,1038163,1041083 Propchange: subversion/tags/1.5.8/ ------------------------------------------------------------------------------ tsvn:logwidthmarker = 78 Modified: subversion/tags/1.5.8/subversion/include/svn_version.h URL: http://svn.apache.org/viewvc/subversion/tags/1.5.8/subversion/include/svn_version.h?rev=1041130&r1=1041089&r2=1041130&view=diff ============================================================================== --- subversion/tags/1.5.8/subversion/include/svn_version.h (original) +++ subversion/tags/1.5.8/subversion/include/svn_version.h Wed Dec 1 18:52:47 2010 @@ -89,7 +89,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_NUMTAG. */ -#define SVN_VER_TAG " (dev build)" +#define SVN_VER_TAG " (r1041089)" /** Number tag: a string describing the version. @@ -104,7 +104,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_TAG. */ -#define SVN_VER_NUMTAG "-dev" +#define SVN_VER_NUMTAG "" /** Revision number: The repository revision number of this release. @@ -115,7 +115,7 @@ extern "C" { * When rolling a tarball, we automatically replace it with what we * guess to be the correct revision number. */ -#define SVN_VER_REVISION 0 +#define SVN_VER_REVISION 1041089 /* Version strings composed from the above definitions. */ From commits-returnsarah76@example.org Wed Dec 01 19:17:45 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 74948 invoked from network); 1 Dec 2010 19:17:45 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 19:17:45 -0000 Received: (qmail 54691 invoked by uid 500); 1 Dec 2010 19:17:45 -0000 Delivered-To: sarah76@example.org Received: (qmail 54668 invoked by uid 500); 1 Dec 2010 19:17:45 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 54661 invoked by uid 99); 1 Dec 2010 19:17:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 19:17:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 19:17:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3C34D23889DA; Wed, 1 Dec 2010 19:16:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041137 - /subversion/trunk/tools/dist/collect_sigs.py Date: Wed, 01 Dec 2010 19:16:13 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: hwright Date: Wed Dec 1 19:16:12 2010 New Revision: 1041137 URL: http://svn.apache.org/viewvc?rev=1041137&view=rev Log: * tools/dist/collect_sigs.py (process_sigs): Remove the instructions to email dev@ with signatures. Modified: subversion/trunk/tools/dist/collect_sigs.py Modified: subversion/trunk/tools/dist/collect_sigs.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/collect_sigs.py?rev=1041137&r1=1041136&r2=1041137&view=diff ============================================================================== --- subversion/trunk/tools/dist/collect_sigs.py (original) +++ subversion/trunk/tools/dist/collect_sigs.py Wed Dec 1 19:16:12 2010 @@ -243,9 +243,7 @@ def process_sigs(signatures): <p>Key ID: <code>%s</code></p> <p>User: <code>%s</code></p> <p>This signature has been saved, and will be included as part of the - release signatures. Please send mail to - <a href="mailto:sarah76@example.org">sarah76@example.org</a> - acknowledging your successful signature.</p> + release signatures.</p> ''' c_unverified = ''' <p style="color: red;">The signature was not able to be verified!</p> From commits-returnsarah76@example.org Wed Dec 01 22:39:24 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 62103 invoked from network); 1 Dec 2010 22:39:23 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Dec 2010 22:39:23 -0000 Received: (qmail 33021 invoked by uid 500); 1 Dec 2010 22:39:23 -0000 Delivered-To: sarah76@example.org Received: (qmail 32968 invoked by uid 500); 1 Dec 2010 22:39:23 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 32961 invoked by uid 99); 1 Dec 2010 22:39:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 22:39:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 22:39:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C9CE72388906; Wed, 1 Dec 2010 22:37:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041199 - in /subversion/branches/1.5.x: STATUS subversion/include/svn_version.h Date: Wed, 01 Dec 2010 22:37:51 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> Author: hwright Date: Wed Dec 1 22:37:51 2010 New Revision: 1041199 URL: http://svn.apache.org/viewvc?rev=1041199&view=rev Log: Post-release version bump. It's doubtful this will ever see the light of day, but just for completeness' sake... * STATUS, subversion/include/svn_version.h: Bump to 1.5.9. Modified: subversion/branches/1.5.x/STATUS subversion/branches/1.5.x/subversion/include/svn_version.h Modified: subversion/branches/1.5.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041199&r1=1041198&r2=1041199&view=diff ============================================================================== --- subversion/branches/1.5.x/STATUS (original) +++ subversion/branches/1.5.x/STATUS Wed Dec 1 22:37:51 2010 @@ -11,7 +11,7 @@ details on how release lines and voting delay a release, etc. -Candidate changes for 1.5.8: +Candidate changes for 1.5.9: ============================ * r876180 Modified: subversion/branches/1.5.x/subversion/include/svn_version.h URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/include/svn_version.h?rev=1041199&r1=1041198&r2=1041199&view=diff ============================================================================== --- subversion/branches/1.5.x/subversion/include/svn_version.h (original) +++ subversion/branches/1.5.x/subversion/include/svn_version.h Wed Dec 1 22:37:51 2010 @@ -66,7 +66,7 @@ extern "C" { * * @since New in 1.1. */ -#define SVN_VER_PATCH 8 +#define SVN_VER_PATCH 9 /** @deprecated Provided for backward compatibility with the 1.0 API. */ From commits-returnsarah76@example.org Thu Dec 02 00:39:52 2010 Return-Path: <commits-returnsarah76@example.org> Delivered-To: sarah76@example.org Received: (qmail 15326 invoked from network); 2 Dec 2010 00:39:52 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 2 Dec 2010 00:39:52 -0000 Received: (qmail 49494 invoked by uid 500); 2 Dec 2010 00:39:52 -0000 Delivered-To: sarah76@example.org Received: (qmail 49470 invoked by uid 500); 2 Dec 2010 00:39:52 -0000 Mailing-List: contact sarah76@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:sarah76@example.org> List-Unsubscribe: <mailto:sarah76@example.org> List-Post: <mailto:sarah76@example.org> List-Id: <commits.subversion.apache.org> Reply-To: sarah76@example.org Delivered-To: mailing list sarah76@example.org Received: (qmail 49463 invoked by uid 99); 2 Dec 2010 00:39:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 00:39:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 00:39:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B42502388906; Thu, 2 Dec 2010 00:38:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041230 - /subversion/trunk/subversion/include/svn_checksum.h Date: Thu, 02 Dec 2010 00:38:17 -0000 To: sarah76@example.org From: sarah76@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <sarah76@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Thu Dec 2 00:38:17 2010 New Revision: 1041230 URL: http://svn.apache.org/viewvc?rev=1041230&view=rev Log: Fix the svn_checksum_to_cstring() docstring to actually say what was intended. Also, make clear that the
{'source': 'Apache Software Foundation Public Mail Archives'}