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

Re: [PATCH] Mistakes in CHANGES file.

From: Ben Reser <ben_at_reser.org>
Date: Wed, 26 Dec 2012 23:11:39 -0800

On Wed, Dec 26, 2012 at 10:35 PM, Arwin Arni <arwin_at_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
]]]
Received on 2012-12-27 08:12:30 CET

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