Re: svn commit: r1425778 - in /subversion/trunk: build.conf tools/dev/fsfs-access-map.c

2012-12-26 Thread Stefan Fuhrmann

On 12/26/2012 12:54 PM, Bert Huijben wrote:
One of the build.conf changes applies to __ALL_TESTS__, not to libs. 
(There is no such section).


I took that from the diff output libs = __ALL__.
Corrected the log message now.

I’m not sure why we add tools that are not used by the test tools to 
the __ALL_TESTS__ target? Do you intend to run it from the test suite. 
(On which platforms?)


No. I don't expect that tool to be used in tests.
I only want to get it built. __ALL_TESTS__ seems
to be the target we use for this purpose already
(e.g. svn-rep-sharing-stats).

Broken window? Maybe, we need a new just
build it target instead of misusing __ALL_TESTS__
as the kitchen sink?

-- Stefan^2.

*From:* stef...@apache.org mailto:stef...@apache.org
*Sent:* December 25, 2012 11:22 PM
*To:* comm...@subversion.apache.org mailto:comm...@subversion.apache.org
*Subject:* svn commit: r1425778 - in /subversion/trunk: build.conf 
tools/dev/fsfs-access-map.c

Author: stefan2
Date: Tue Dec 25 22:22:07 2012
New Revision: 1425778

URL: http://svn.apache.org/viewvc?rev=1425778view=rev
Log:
A new developer tool: take an strace from some fsfs-based operation
and create a read access heat map for it.  The latter gets written
as BMP file along with a few stats.  This allows to visualize the
efficiency (or lack thereof) of our FS usage.

* build.conf
  (libs): add new dependency
  (fsfs-access-map): new tool

* tools/dev/fsfs-access-map.c
  (): new tool

Added:
subversion/trunk/tools/dev/fsfs-access-map.c
Modified:
subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1425778r1=1425777r2=1425778view=diff

==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Dec 25 22:22:07 2012
@@ -1224,7 +1224,7 @@ libs = __ALL__
ra-local-test




Re: svn commit: r1425778 - in /subversion/trunk: build.conf tools/dev/fsfs-access-map.c

2012-12-26 Thread Hyrum K Wright
On Wed, Dec 26, 2012 at 8:31 AM, Stefan Fuhrmann 
stefanfuhrm...@alice-dsl.de wrote:

  On 12/26/2012 12:54 PM, Bert Huijben wrote:

  One of the build.conf changes applies to __ALL_TESTS__, not to libs.
 (There is no such section).


 I took that from the diff output libs = __ALL__.
 Corrected the log message now.


  I’m not sure why we add tools that are not used by the test tools to the
 __ALL_TESTS__ target? Do you intend to run it from the test suite. (On
 which platforms?)


 No. I don't expect that tool to be used in tests.
 I only want to get it built. __ALL_TESTS__ seems
 to be the target we use for this purpose already
 (e.g. svn-rep-sharing-stats).

 Broken window? Maybe, we need a new just
 build it target instead of misusing __ALL_TESTS__
 as the kitchen sink?


Possibly.  It may also be useful to consider whether or not we should ship
tools like this.  (Though, I expect that packagers would probably them out
into separate packages anyway, so maybe it's moot.)


Re: [PATCH] fix for diff optimization bug

2012-12-26 Thread Hideki IWAMOTO
Hi.

 It would be very useful to have a regression test for the bug that you have 
 found.? Would you be able to convert your reproduction recipe into a 
 regression test written in C like the that one on trunk?
 Please let us know if you would be willing to write a test for the bug you 
 found, and/or port test 13 to version 1.7, and/or write a patch to fix the 
 bug shown by test number 13.? We can treat them as two entirely separate 
 problems, but maybe you have the skill and wish to help fix both of them.

I converted the recipe into regression test and created a new patch for nightly 
tarball. 
I will investigate issue #4133 later. 


diffstat:
 subversion/libsvn_diff/diff_file.c |   10 ++-
 subversion/tests/libsvn_diff/diff-diff3-test.c |   69 +
 2 files changed, 76 insertions(+), 3 deletions(-)


On Mon, 24 Dec 2012 20:51:09 + (GMT)
Julian Foad julianf...@btopenworld.com wrote:

 Hi, Hideki.? Thank you very much for finding this bug and a fix for it.
 You might be interested to know that on the 'trunk',  a new test has already 
 been added for a similar problem:
 
 $ ./subversion/tests/libsvn_diff/diff-diff3-test --list
 [...]
 ? 13??? XFAIL? difference at the start of a 128KB window
 
 We don't have a fix for this bug yet.? I don't know whether this bug also 
 exists in version 1.7.8.
 
 
 It would be very useful to have a regression test for the bug that you have 
 found.? Would you be able to convert your reproduction recipe into a 
 regression test written in C like the that one on trunk?
 Please let us know if you would be willing to write a test for the bug you 
 found, and/or port test 13 to version 1.7, and/or write a patch to fix the 
 bug shown by test number 13.? We can treat them as two entirely separate 
 problems, but maybe you have the skill and wish to help fix both of them.
 
 - Julian
 
 
 Hideki IWAMOTO wrote:
 
  The optimization of diff inclued in version 1.7 has a bug that
  produces incorrect diff on a certain condition.
  The attached patch fix it. 
  
  
  Detail of the bug
  -
  
  When the identical suffix begins at the boundary of a chunk,
  datasource_get_next_token() defined in subversion/libsvn_diff/diff_file.c
  does not stop at head of the identical suffix.
  Therefore, when one of the identical suffixes of the original file
  and the modified file begin from the boundary of a chunk,
  excessive tokens are added to the diff tree.
  
  How to reproduce
  
  
  $ for ((i=0;i8256;i++)); do echo 0123456789abcde; done  test.txt
  $ hexdump -C test.txt
  ? 30 31 32 33 34 35 36 37? 38 39 61 62 63 64 65 0a? 
  |0123456789abcde.|
  *
  00020400
  $ svn add test.txt; svn ci -m test
  A? ? ? ?  test.txt
  Adding? ? ? ?  test.txt
  Transmitting file data .
  Committed revision 2.
  $ echo 0123456789ABCDE |dd of=test.txt bs=16 seek=64 conv=notrunc
  1+0 records in
  1+0 records out
  $ echo 0123456789ABCDE |dd of=test.txt bs=16 seek=8141 conv=notrunc
  1+0 records in
  1+0 records out
  $ echo 0123456789abcde  test.txt
  $ echo 0123456789abcde  test.txt
  $ hexdump -C test.txt
  ? 30 31 32 33 34 35 36 37? 38 39 61 62 63 64 65 0a? 
  |0123456789abcde.|
  *
  0400? 30 31 32 33 34 35 36 37? 38 39 41 42 43 44 45 0a? 
  |0123456789ABCDE.|
  0410? 30 31 32 33 34 35 36 37? 38 39 61 62 63 64 65 0a? 
  |0123456789abcde.|
  *
  0001fcd0? 30 31 32 33 34 35 36 37? 38 39 41 42 43 44 45 0a? 
  |0123456789ABCDE.|
  0001fce0? 30 31 32 33 34 35 36 37? 38 39 61 62 63 64 65 0a? 
  |0123456789abcde.|
  *
  00020420
  $ svn cat test.txt | diff -u - test.txt
  --- -?  2012-12-24 22:30:18.760832000 +0900
  +++ test.txt? ? 2012-12-24 22:29:24.0 +0900
  @@ -62,6 +62,7 @@
  0123456789abcde
  0123456789abcde
  0123456789abcde
  +0123456789ABCDE
  0123456789abcde
  0123456789abcde
  0123456789abcde
  @@ -8138,6 +8139,7 @@
  0123456789abcde
  0123456789abcde
  0123456789abcde
  +0123456789ABCDE
  0123456789abcde
  0123456789abcde
  0123456789abcde
  $ svn di test.txt
  Index: test.txt
  ===
  --- test.txt? ? (revision 2)
  +++ test.txt? ? (working copy)
  @@ -62,6 +62,7 @@
  0123456789abcde
  0123456789abcde
  0123456789abcde
  +0123456789ABCDE
  0123456789abcde
  0123456789abcde
  0123456789abcde
  @@ -8138,6 +8139,7 @@
  0123456789abcde
  0123456789abcde
  0123456789abcde
  +0123456789ABCDE
  0123456789abcde
  0123456789abcde
  0123456789abcde
  @@ -8188,6 +8190,72 @@
  0123456789abcde
  0123456789abcde
  0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  +0123456789abcde
  

Re: [PATCH] code file names linkified in general.html of the Hacking Guide

2012-12-26 Thread Gabriela Gibson

[[[
Changes to two section which are assembled into
http://subversion.apache.org/docs/community-guide/general.html

* docs/community-guide/general.part.html
  (code-to-read): Linkified code file names.

* docs/community-guide/general.part.html
  (directory-layout): Linkified code file names.

 Patch by: Gabriela Gibson gabriela.gib...@gmail.com
]]]
Index: docs/community-guide/general.part.html
===
--- docs/community-guide/general.part.html	(revision 1425918)
+++ docs/community-guide/general.part.html	(working copy)
@@ -174,15 +184,54 @@ understanding of the implementation details.  Here
 perusal order:/p
 
 ol
-lipthe basic building blocks:  svn_string.h, svn_error.h, svn_types.h/p
+lipthe basic building blocks:  
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_string.h;
+  svn_string.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_error.h;
+  svn_error.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_types.h;
+  svn_types.h/a/p
 /li
-lipuseful utilities:  svn_io.h, svn_path.h, svn_hash.h, svn_xml.h/p
+lip
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_io.h;
+  svn_io.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_path.h;
+  svn_path.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_hash.h;
+  svn_hash.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_xml.h;
+  svn_xml.h/a/p
 /li
-lipthe critical interface:  svn_delta.h/p
+lipthe critical interface: 
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_delta.h;
+  svn_delta.h/a/p
 /li
-lipclient-side interfaces:  svn_ra.h, svn_wc.h, svn_client.h/p
+lipclient-side interfaces:  
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_ra.h;
+  svn_ra.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_wc.h;
+  svn_wc.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_client.h;
+  svn_client.h/a/p
 /li
-lipthe repository and versioned filesystem:  svn_repos.h, svn_fs.h/p
+lipthe repository and versioned filesystem: 
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_repos.h;
+  svn_repos.h/a,
+a href=
+https://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_fs.h;
+  svn_fs.h/a/p
 /li
 /ol
 
@@ -199,11 +248,25 @@ understand Subversion without first glancing over
 in APR (look in 'apr/include/'):/p
 
 ul
-lipmemory pools:  apr_pools.h/p/li
-lipfilesystem access:  apr_file_io.h/p/li
-liphashes and arrays:  apr_hash.h, apr_tables.h/p/li
+lipmemory pools:  
+a href=
+http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/include/apr_pools.h;
+  apr_pools.h/a/p/li
+lipfilesystem access:  
+a href=
+http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/include/apr_file_io.h;
+  apr_file_io.h/a/p/li
+liphashes and arrays: 
+a href=
+http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/include/apr_hash.h;
+  apr_hash.h/a,
+a href=
+http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/include/apr_tables.h;
+  apr_tables.h/a
+/p/li
 /ul
 
+
 pSubversion also tries to deliver reliable and secure software. This
 can only be achieved by developers who understand secure programming
 in the C programming language. Please see 'notes/assurance.txt' for
@@ -218,72 +281,132 @@ to ask for review on the developer mailing list./
 
 div class=h2 id=directory-layout
 h2Directory layout
-  a class=sectionlink href=!--#echo var=GUIDE_GENERAL_PAGE --#directory-layout
+  a class=sectionlink href=general.html#directory-layout
 title=Link to this sectionpara;/a
 /h2
 
 pA rough guide to the source tree:/p
 
 ul
-lipttdoc//ttbr /
+liptta 
+href=https://svn.apache.org/repos/asf/subversion/trunk/doc/;
+	doc//a/ttbr /
 User and Developer documentation./p
 /li
-liptttools//ttbr /
+
+liptta
+href=https://svn.apache.org/repos/asf/subversion/trunk/tools/;
+	tools//a/ttbr /
+
 Stuff that works with Subversion, but that Subversion doesn't
 depend on.  Code in tools/ is maintained collectively by the
 Subversion project, and is under the same open source copyright as
 Subversion itself./p
 /li
-lipttcontrib//ttbr /
+
+liptta 
+href=https://svn.apache.org/repos/asf/subversion/trunk/contrib/;
+	contrib//a/ttbr /
+
 Stuff that works with Subversion, but that Subversion doesn't
 depend on, and that is maintained by individuals who may or may
 not participate in Subversion development.  Code in contrib/ is
 open source, but may have a different license or copyright holder
 than Subversion itself./p
 /li
+
 lipttpackages//ttbr /
 Stuff to help packaging systems, like rpm and dpkg./p
 /li
-lipttsubversion//ttbr /
+
+liptta 
+   

[PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Arwin Arni

Hi,

Fixing a couple of mistakes in the CHANGES file.

Regards,
Arwin Arni
* subversion/CHANGES

Fixed a chronological mistake. (1.7.7 has r1237779)

Fixed a typo. (r139917 is r1399174)

Patch by: Arwin Arni arwin{_AT_}collab.net
Index: CHANGES
===
--- CHANGES	(revision 1421305)
+++ CHANGES	(working copy)
@@ -65,7 +65,7 @@
   - Client-side bugfixes:
 * fix crash with --username option on Windows (r1396285)
 * add missing attributes to svn log -v --xml output (r1398100)
-* fix svn patch ignoring hunks after no trailing newline (r139917)
+* fix svn patch ignoring hunks after no trailing newline (r1399174)
 * fix hang with ra_serf during error processing (r1403583)
 * ignore file externals with mergeinfo when merging (r1401915)
 * fix svnmucc cp segfault with a missing last argument (issue #4079)
@@ -73,7 +73,6 @@
 
   - Server-side bugfixes:
 * properly detect threading availability (r1398325)
-* fix svnadmin load --bypass-prop-validation (r1237779)
 * fix parsing of [groupsfoo] sections in authz file (issue #3531)
 * add Vary: header to GET responses to improve cacheability (r1390653)
 * fix fs_fs to cleanup after failed rep transmission (r1403964, et al)
@@ -103,6 +102,7 @@
 * fix unknown password stores in config file cause error (r1375052)
 * fix assertions in ra_serf running against server root (r1365519, et al)
 * fix ra_serf checkout/export aborts early on Windows (issue #4174)
+* fix svnadmin load --bypass-prop-validation (r1237779)
  
   - Server-side bugfixes:
 * fix an assert with SVNAutoVersioning in mod_dav_svn (issue #4231)


Re: [PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Arwin Arni

On 12/27/2012 12:00 PM, Arwin Arni wrote:

Hi,

Fixing a couple of mistakes in the CHANGES file.

Regards,
Arwin Arni

Sorry,

Moved the change to the wrong section. Here's the corrected patch.
* subversion/CHANGES

Fixed a chronological mistake. (1.7.7 has r1237779)

Fixed a typo. (r139917 is r1399174)

Patch by: Arwin Arni arwin{_AT_}collab.net
Index: CHANGES
===
--- CHANGES	(revision 1421305)
+++ CHANGES	(working copy)
@@ -65,7 +65,7 @@
   - Client-side bugfixes:
 * fix crash with --username option on Windows (r1396285)
 * add missing attributes to svn log -v --xml output (r1398100)
-* fix svn patch ignoring hunks after no trailing newline (r139917)
+* fix svn patch ignoring hunks after no trailing newline (r1399174)
 * fix hang with ra_serf during error processing (r1403583)
 * ignore file externals with mergeinfo when merging (r1401915)
 * fix svnmucc cp segfault with a missing last argument (issue #4079)
@@ -73,7 +73,6 @@
 
   - Server-side bugfixes:
 * properly detect threading availability (r1398325)
-* fix svnadmin load --bypass-prop-validation (r1237779)
 * fix parsing of [groupsfoo] sections in authz file (issue #3531)
 * add Vary: header to GET responses to improve cacheability (r1390653)
 * fix fs_fs to cleanup after failed rep transmission (r1403964, et al)
@@ -110,6 +109,7 @@
 * fix svndumpfilter exclude --targets requires leading slash (issue #4234)
 * fix connection ttl for memcache should be 50 seconds (r1391641)
 * stabilize order of paths in dumpfiles with APR 1.4.6 (r1344864, et al)
+* fix svnadmin load --bypass-prop-validation (r1237779)
 
  Developer-visible changes:
   - General:


Re: [PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Ben Reser
On Wed, Dec 26, 2012 at 10:35 PM, Arwin Arni ar...@collab.net wrote:
 Sorry,

 Moved the change to the wrong section. Here's the corrected patch.

 * subversion/CHANGES

 Fixed a chronological mistake. (1.7.7 has r1237779)

 Fixed a typo. (r139917 is r1399174)

 Patch by: Arwin Arni arwin{_AT_}collab.net

How do you figure r1237779 is in 1.7.7?

It was merged here
[[[
r1400360 | svn-role | 2012-10-19 21:03:25 -0700 (Fri, 19 Oct 2012) | 10 lines

Merge r1237779 from trunk:

 * r1237779
   Fix sense of property validation on load and make the revprop change atomic.
   Justification:
 Validation is supposed to be on by default but is off, adding
 --bypass-prop-validation switches it on.
   Votes:
 +1: philip, cmpilato, danielsh
]]]

1.7.7's tag has the following in svn_version.h
[[[
#define SVN_VER_TAG (r1393599)
]]]
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/include/svn_version.h

r1400360 clearly comes after r1393599.

And just for extra clarity comparing the file changed by r1237779
between 1.7.7 and 1.7.8 shows the change
[[[
$ svn diff 
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/libsvn_repos/load-fs-vtable.c
http://svn.apache.org/repos/asf/subversion/tags/1.7.8/subversion/libsvn_repos/load-fs-vtable.c
Index: load-fs-vtable.c
===
--- load-fs-vtable.c(.../1.7.7/subversion/libsvn_repos/load-fs-vtable.c)
(revision
1426134)
+++ load-fs-vtable.c(.../1.7.8/subversion/libsvn_repos/load-fs-vtable.c)
(revision
1426134)
@@ -154,12 +154,12 @@
 apr_pool_t *pool)
 {
   if (validate_props)
-return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
-   NULL, value, pool);
-  else
 return svn_repos_fs_change_rev_prop4(repos, revision, NULL, name,
  NULL, value, FALSE, FALSE,
  NULL, NULL, pool);
+  else
+return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
+   NULL, value, pool);
 }

 /* Change property NAME to VALUE for PATH in TXN_ROOT.  If
]]]


Re: [PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Arwin Arni
Oops. I got confused with the revision in which the change was made in 
trunk and the revision in which it was merged to the branch.



On 12/27/2012 12:41 PM, Ben Reser wrote:

On Wed, Dec 26, 2012 at 10:35 PM, Arwin Arni ar...@collab.net wrote:

Sorry,

Moved the change to the wrong section. Here's the corrected patch.
* subversion/CHANGES

Fixed a chronological mistake. (1.7.7 has r1237779)

Fixed a typo. (r139917 is r1399174)

Patch by: Arwin Arni arwin{_AT_}collab.net

How do you figure r1237779 is in 1.7.7?

It was merged here
[[[
r1400360 | svn-role | 2012-10-19 21:03:25 -0700 (Fri, 19 Oct 2012) | 10 lines

Merge r1237779 from trunk:

  * r1237779
Fix sense of property validation on load and make the revprop change atomic.
Justification:
  Validation is supposed to be on by default but is off, adding
  --bypass-prop-validation switches it on.
Votes:
  +1: philip, cmpilato, danielsh
]]]

1.7.7's tag has the following in svn_version.h
[[[
#define SVN_VER_TAG (r1393599)
]]]
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/include/svn_version.h

r1400360 clearly comes after r1393599.

And just for extra clarity comparing the file changed by r1237779
between 1.7.7 and 1.7.8 shows the change
[[[
$ svn diff 
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/libsvn_repos/load-fs-vtable.c
http://svn.apache.org/repos/asf/subversion/tags/1.7.8/subversion/libsvn_repos/load-fs-vtable.c
Index: load-fs-vtable.c
===
--- load-fs-vtable.c(.../1.7.7/subversion/libsvn_repos/load-fs-vtable.c)
(revision
1426134)
+++ load-fs-vtable.c(.../1.7.8/subversion/libsvn_repos/load-fs-vtable.c)
(revision
1426134)
@@ -154,12 +154,12 @@
  apr_pool_t *pool)
  {
if (validate_props)
-return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
-   NULL, value, pool);
-  else
  return svn_repos_fs_change_rev_prop4(repos, revision, NULL, name,
   NULL, value, FALSE, FALSE,
   NULL, NULL, pool);
+  else
+return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
+   NULL, value, pool);
  }

  /* Change property NAME to VALUE for PATH in TXN_ROOT.  If
]]]




Re: [PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Arwin Arni

Here's the typo fix.

On 12/27/2012 12:52 PM, Arwin Arni wrote:
Oops. I got confused with the revision in which the change was made in 
trunk and the revision in which it was merged to the branch.



On 12/27/2012 12:41 PM, Ben Reser wrote:

On Wed, Dec 26, 2012 at 10:35 PM, Arwin Arni ar...@collab.net wrote:

Sorry,

Moved the change to the wrong section. Here's the corrected patch.
* subversion/CHANGES

Fixed a chronological mistake. (1.7.7 has r1237779)

Fixed a typo. (r139917 is r1399174)

Patch by: Arwin Arni arwin{_AT_}collab.net

How do you figure r1237779 is in 1.7.7?

It was merged here
[[[
r1400360 | svn-role | 2012-10-19 21:03:25 -0700 (Fri, 19 Oct 2012) | 
10 lines


Merge r1237779 from trunk:

  * r1237779
Fix sense of property validation on load and make the revprop 
change atomic.

Justification:
  Validation is supposed to be on by default but is off, adding
  --bypass-prop-validation switches it on.
Votes:
  +1: philip, cmpilato, danielsh
]]]

1.7.7's tag has the following in svn_version.h
[[[
#define SVN_VER_TAG (r1393599)
]]]
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/include/svn_version.h 



r1400360 clearly comes after r1393599.

And just for extra clarity comparing the file changed by r1237779
between 1.7.7 and 1.7.8 shows the change
[[[
$ svn diff 
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/subversion/libsvn_repos/load-fs-vtable.c
http://svn.apache.org/repos/asf/subversion/tags/1.7.8/subversion/libsvn_repos/load-fs-vtable.c 


Index: load-fs-vtable.c
===
--- load-fs-vtable.c 
(.../1.7.7/subversion/libsvn_repos/load-fs-vtable.c) (revision

1426134)
+++ load-fs-vtable.c 
(.../1.7.8/subversion/libsvn_repos/load-fs-vtable.c) (revision

1426134)
@@ -154,12 +154,12 @@
  apr_pool_t *pool)
  {
if (validate_props)
-return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
-   NULL, value, pool);
-  else
  return svn_repos_fs_change_rev_prop4(repos, revision, NULL, name,
   NULL, value, FALSE, FALSE,
   NULL, NULL, pool);
+  else
+return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
+   NULL, value, pool);
  }

  /* Change property NAME to VALUE for PATH in TXN_ROOT.  If
]]]




* subversion/CHANGES

Fixed a typo. (r139917 is r1399174)

Patch by: Arwin Arni arwin{_AT_}collab.net
Index: CHANGES
===
--- CHANGES	(revision 1421305)
+++ CHANGES	(working copy)
@@ -65,7 +65,7 @@
   - Client-side bugfixes:
 * fix crash with --username option on Windows (r1396285)
 * add missing attributes to svn log -v --xml output (r1398100)
-* fix svn patch ignoring hunks after no trailing newline (r139917)
+* fix svn patch ignoring hunks after no trailing newline (r1399174)
 * fix hang with ra_serf during error processing (r1403583)
 * ignore file externals with mergeinfo when merging (r1401915)
 * fix svnmucc cp segfault with a missing last argument (issue #4079)


Re: [PATCH] Mistakes in CHANGES file.

2012-12-26 Thread Ben Reser
On Wed, Dec 26, 2012 at 11:29 PM, Arwin Arni ar...@collab.net wrote:
 Here's the typo fix.

Thanks committed in r1426138.