Re: [PATCH] Issue #3919: fix for spurious property conflict during merge

2011-06-11 Thread noorul Islam. Kamal Malmiyoda
On Jun 12, 2011, at 1:36 AM, "Brian Neal" wrote: > Hello - > > Attached is a patch for issue #3919 [1]. Please review when you have a > chance. Thanks! > > Possible commit message: > > [[[ > Fix issue #3919. During a merge of a property, add a check against the > incoming new property value

Re: svn commit: r1134075 - in /subversion/trunk: configure.ac tools/dist/construct-rolling-environment.sh

2011-06-11 Thread Daniel Shahaf
Daniel Shahaf wrote on Fri, Jun 10, 2011 at 15:28:49 +0300: > get-deps.sh too? > Done in r1134734 by Arfrever (who doesn't have a working MUA at the moment).

[PATCH] Issue #3919: fix for spurious property conflict during merge

2011-06-11 Thread Brian Neal
Hello - Attached is a patch for issue #3919 [1]. Please review when you have a chance. Thanks! Possible commit message: [[[ Fix issue #3919. During a merge of a property, add a check against the incoming new property value and the working copy value. If they already match, then the merge trivial

Re: [PATCH] possible improvement to svn log with "forward" revision range (issue 3830)

2011-06-11 Thread Dirk Thomas
I have updated the patch of "libsvn_client/log.c" according to your suggestions. Additionally i have added a test to "tests/cmdline/log_tests.py" to check for desired results. The newly added test will pass when the above enhancement has been applied (other tests also pass). The combined patch

Re: svn commit: r1134553 - in /subversion/trunk/subversion: include/svn_xml.h libsvn_subr/deprecated.c libsvn_subr/xml.c

2011-06-11 Thread Daniel Shahaf
Daniel Shahaf wrote on Sat, Jun 11, 2011 at 15:37:40 +0300: > s...@apache.org wrote on Sat, Jun 11, 2011 at 08:48:24 -: > > +/* Like svn_xml_make_header2, but does not emit encoding information. */ > > +SVN_DEPRECATED > > +void > > svn_xml_make_header(svn_stringbuf_t **str, > >

Re: svn commit: r1127709 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c

2011-06-11 Thread Daniel Shahaf
Stefan Fuhrmann wrote on Sat, Jun 11, 2011 at 10:13:27 +0200: > On 10.06.2011 22:28, Daniel Shahaf wrote: > >stef...@apache.org wrote on Wed, May 25, 2011 at 22:20:25 -: > >>Author: stefan2 > >>Date: Wed May 25 22:20:25 2011 > >>New Revision: 1127709 > >> > >>URL: http://svn.apache.org/viewvc?r

Re: svn commit: r1134484 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/dump.c tests/cmdline/svnadmin_tests.py

2011-06-11 Thread Daniel Shahaf
Stefan Sperling wrote on Sat, Jun 11, 2011 at 09:29:14 +0200: > On Fri, Jun 10, 2011 at 11:45:52PM -, danie...@apache.org wrote: > > Author: danielsh > > Date: Fri Jun 10 23:45:51 2011 > > New Revision: 1134484 > > > > URL: http://svn.apache.org/viewvc?rev=1134484&view=rev > > Log: > > Verify

Re: svn commit: r1134075 - in /subversion/trunk: configure.ac tools/dist/construct-rolling-environment.sh

2011-06-11 Thread Daniel Shahaf
Arfrever Frehtes Taifersar Arahesis wrote on Sat, Jun 11, 2011 at 02:41:45 +0200: > 2011-06-10 14:17:40 Daniel Shahaf napisał(a): > > arfre...@apache.org wrote on Thu, Jun 09, 2011 at 21:01:19 -: > > > Author: arfrever > > > Date: Thu Jun 9 21:01:18 2011 > > > New Revision: 1134075 > > > > >

Re: svn commit: r1134553 - in /subversion/trunk/subversion: include/svn_xml.h libsvn_subr/deprecated.c libsvn_subr/xml.c

2011-06-11 Thread Daniel Shahaf
s...@apache.org wrote on Sat, Jun 11, 2011 at 08:48:24 -: > +/* Like svn_xml_make_header2, but does not emit encoding information. */ > +SVN_DEPRECATED > +void > svn_xml_make_header(svn_stringbuf_t **str, > apr_pool_t *pool); @deprecated Provided for ^X^L^L

Re: svn commit: r1134219 - /subversion/trunk/configure.ac

2011-06-11 Thread Julian Foad
On Sat, 2011-06-11, Daniel Shahaf wrote: > phi...@apache.org wrote on Fri, Jun 10, 2011 at 07:50:17 -: > > Author: philip > > Date: Fri Jun 10 07:50:17 2011 > > New Revision: 1134219 > > > > URL: http://svn.apache.org/viewvc?rev=1134219&view=rev > > Log: > > * configure.ac: Don't replace svn_p

Re: [Issue 3618] suggest course of action after merge tree-conflicts due to missing subtrees

2011-06-11 Thread Daniel Shahaf
Stefan Sperling wrote on Sat, Jun 11, 2011 at 09:21:57 +0200: > On Sat, Jun 11, 2011 at 12:24:12AM +0300, Daniel Shahaf wrote: > > pbu...@tigris.org wrote on Thu, Jun 02, 2011 at 08:00:38 -0700: > > > There's no easy way to determine the shallow structure of a working copy > > > (beyond > > > writ

Re: svn commit: r1134489 - /subversion/trunk/tools/dist/release.py

2011-06-11 Thread Daniel Shahaf
Hyrum K Wright wrote on Sat, Jun 11, 2011 at 04:01:07 -0500: > On Fri, Jun 10, 2011 at 7:49 PM, Daniel Shahaf > wrote: > > hwri...@apache.org wrote on Sat, Jun 11, 2011 at 00:14:03 -: > >> +# About this script: > >> +#   This script is intended to simplify creating Subversion releases, by > >

Re: svn commit: r1134489 - /subversion/trunk/tools/dist/release.py

2011-06-11 Thread Hyrum K Wright
On Fri, Jun 10, 2011 at 7:49 PM, Daniel Shahaf wrote: > hwri...@apache.org wrote on Sat, Jun 11, 2011 at 00:14:03 -: >> +# About this script: >> +#   This script is intended to simplify creating Subversion releases, by >> +#   automating as much as is possible.  It works well with our Apache >

Re: svn commit: r1127709 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c

2011-06-11 Thread Stefan Fuhrmann
On 10.06.2011 22:28, Daniel Shahaf wrote: stef...@apache.org wrote on Wed, May 25, 2011 at 22:20:25 -: Author: stefan2 Date: Wed May 25 22:20:25 2011 New Revision: 1127709 URL: http://svn.apache.org/viewvc?rev=1127709&view=rev Log: Fix a pool usage issue: svn_cache__get_partial() may be cal

Re: svn commit: r1134484 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/dump.c tests/cmdline/svnadmin_tests.py

2011-06-11 Thread Stefan Sperling
On Fri, Jun 10, 2011 at 11:45:52PM -, danie...@apache.org wrote: > Author: danielsh > Date: Fri Jun 10 23:45:51 2011 > New Revision: 1134484 > > URL: http://svn.apache.org/viewvc?rev=1134484&view=rev > Log: > Verify FS paths for validity during dump. Follow-up to r1129641, which added > valid

Re: [Issue 3618] suggest course of action after merge tree-conflicts due to missing subtrees

2011-06-11 Thread Stefan Sperling
On Sat, Jun 11, 2011 at 12:24:12AM +0300, Daniel Shahaf wrote: > pbu...@tigris.org wrote on Thu, Jun 02, 2011 at 08:00:38 -0700: > > There's no easy way to determine the shallow structure of a working copy > > (beyond > > writing a script that parses the output of 'svn info -R'). > > > > That wo