Re: [RFC][PATCH 00/22] JavaHL Ra API Implementation

On Mon, Apr 23, 2012 at 10:03 AM, Hyrum K Wright wrote: > I haven't reviewed the patched, but some comments about the general ideas > below. > > On Sat, Apr 21, 2012 at 10:51 PM, Vladimir Berezniker > wrote: > > Hi All, > > > > I am sending patch series that adds support for subset of SVN Ra la

Re: svn commit: r1329609 - in /subversion/trunk/subversion: include/svn_error.h libsvn_fs/fs-loader.c

On Tue, Apr 24, 2012 at 4:40 AM, wrote: > Author: danielsh > Date: Tue Apr 24 09:40:45 2012 > New Revision: 1329609 > > URL: http://svn.apache.org/viewvc?rev=1329609&view=rev > Log: > Follow-up to r1329601: > > * subversion/include/svn_error.h >  (SVN_ERR_ASSERT2): New. Our standard convention i

RE: svn commit: r1329897 - in /subversion/trunk/subversion: bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java include/svn_wc.h libsvn_wc/update_editor.c svn/notify.c tests/

> -Original Message- > From: Hyrum K Wright [mailto:hyrum.wri...@wandisco.com] > Sent: dinsdag 24 april 2012 20:24 > To: dev@subversion.apache.org > Cc: comm...@subversion.apache.org > Subject: Re: svn commit: r1329897 - in /subversion/trunk/subversion: > bindings/javahl/src/org/apache/su

Two-phase merge

Hi all, This one is basically the technical post promised in my "Merge Policies" post. The proposal I make here is not an alternative to e.g. "Symmetric Merge" but rather a refined merge strategy that would also benefit the current merge. Today, the merge algorithm will do the following for a me

Re: Merge-relevant information that is hard to come by

Stefan Fuhrmann wrote on Tue, Apr 24, 2012 at 22:20:52 +0200: > (2) Modified merges. > In case of textual conflicts, users will usually resolve them > before committing the merge result. Depending on policies, > a user may even need to modify textually successful merges > to e.g. fix a broken build

Merge-relevant information that is hard to come by

Hi all, This post is meant to document two pieces of information that SVN does not track explicitly and how that effects SVN's merge logic. I'm not an expert on the merge code as we use it in SVN right now, so feel free to correct me if some of the following is already being addressed. Also, I'm

Re: svn commit: r1329475 - /subversion/trunk/notes/ev2-callbacks-template.c

gst...@apache.org wrote on Mon, Apr 23, 2012 at 22:08:37 -: > +add_directory_cb(void *baton, > +add_file_cb(void *baton, > +add_symlink_cb(void *baton, > +add_absent_cb(void *baton, > +alter_directory_cb(void *baton, > +alter_file_cb(void *baton, > +alter_symlink_cb(void *baton, > +delete_cb(vo

Note on implementing Symmetric Merge

Hi Julian & interested parties, I had this issue popping up and no clear idea where to put it in the wiki - so I'm posting it here. Since symmetric merge has more freedom in choosing base and merge order, the meaning of "base", "mine", "theirs" etc. might become ambiguous if they are being deriv

Re: svn commit: r1329897 - in /subversion/trunk/subversion: bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java include/svn_wc.h libsvn_wc/update_editor.c svn/notify.c tests/

On Tue, Apr 24, 2012 at 1:07 PM, Hyrum K Wright wrote: > On Tue, Apr 24, 2012 at 1:01 PM,   wrote: >> Author: rhuijben >> Date: Tue Apr 24 18:01:23 2012 >> New Revision: 1329897 >> >> URL: http://svn.apache.org/viewvc?rev=1329897&view=rev >> Log: >> Following up on r1329876, report updated files t

Re: svn commit: r1329897 - in /subversion/trunk/subversion: bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java include/svn_wc.h libsvn_wc/update_editor.c svn/notify.c tests/

On Tue, Apr 24, 2012 at 1:01 PM, wrote: > Author: rhuijben > Date: Tue Apr 24 18:01:23 2012 > New Revision: 1329897 > > URL: http://svn.apache.org/viewvc?rev=1329897&view=rev > Log: > Following up on r1329876, report updated files that had only their lock > removed > with a specific notify actio

Re: svn commit: r1326307 - in /subversion/trunk: ./ build/ac-macros/ subversion/include/ subversion/include/private/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/mod_dav_svn/ subversion

stef...@apache.org wrote on Sun, Apr 15, 2012 at 11:20:59 -: > Author: stefan2 > Date: Sun Apr 15 11:20:58 2012 > New Revision: 1326307 > > URL: http://svn.apache.org/viewvc?rev=1326307&view=rev > Log: > Merge all changes (-r1298521-1326293) from branches/revprop-cache to trunk > and resolve m

Re: svn commit: r1329015 - in /subversion/trunk/subversion: include/private/svn_ra_private.h libsvn_ra/editor.c libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h

On Apr 24, 2012 12:29 PM, "Daniel Shahaf" wrote: > > Greg Stein wrote on Tue, Apr 24, 2012 at 12:20:26 -0400: > > On Apr 24, 2012 10:08 AM, "Daniel Shahaf" wrote: > > > > > > Greg Stein wrote on Mon, Apr 23, 2012 at 22:47:43 -0400: > > > > On Apr 23, 2012 7:20 PM, "Hyrum K Wright" > > wrote: > >

Re: svn commit: r1329015 - in /subversion/trunk/subversion: include/private/svn_ra_private.h libsvn_ra/editor.c libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h

Greg Stein wrote on Tue, Apr 24, 2012 at 12:20:26 -0400: > On Apr 24, 2012 10:08 AM, "Daniel Shahaf" wrote: > > > > Greg Stein wrote on Mon, Apr 23, 2012 at 22:47:43 -0400: > > > On Apr 23, 2012 7:20 PM, "Hyrum K Wright" > wrote: > > > > > > > > On Mon, Apr 23, 2012 at 4:55 PM, Greg Stein wrote:

Re: svn commit: r1329015 - in /subversion/trunk/subversion: include/private/svn_ra_private.h libsvn_ra/editor.c libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h

On Apr 24, 2012 10:08 AM, "Daniel Shahaf" wrote: > > Greg Stein wrote on Mon, Apr 23, 2012 at 22:47:43 -0400: > > On Apr 23, 2012 7:20 PM, "Hyrum K Wright" wrote: > > > > > > On Mon, Apr 23, 2012 at 4:55 PM, Greg Stein wrote: > > > > On Mon, Apr 23, 2012 at 16:21, Hyrum K Wright < hyrum.wri...@w

Re: svn commit: r1329808 - /subversion/trunk/subversion/tests/svn_test.h

On Apr 24, 2012 11:51 AM, wrote: >... > +++ subversion/trunk/subversion/tests/svn_test.h Tue Apr 24 15:50:45 2012 > @@ -74,6 +74,7 @@ extern "C" { > } while (0) > > /** Handy macro for testing string equality. > + * EXPR and/or EXPECTED_EXPR may be NULL. > */ ... may be NULL, indicating failu

Re: svn commit: r1326337 - /subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c

On Apr 24, 2012 11:15 AM, "Daniel Shahaf" wrote: > > stef...@apache.org wrote on Sun, Apr 15, 2012 at 13:42:44 -: >... > > +++ subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c Sun Apr 15 13:42:44 2012 > > @@ -88,6 +88,12 @@ > > */ > > #define SHM_NAME_SUFFIX "Shm" > > > > +/* Prev

Re: svn commit: r1329778 - /subversion/trunk/subversion/libsvn_subr/string.c

On Apr 24, 2012 11:19 AM, wrote: >... > +++ subversion/trunk/subversion/libsvn_subr/string.c Tue Apr 24 15:19:19 2012 > @@ -942,8 +942,10 @@ static const char decimal_table[100][4] > *(apr_uint16_t*)(dest) = *(apr_uint16_t*)(source); > #else > # define COPY_TWO_BYTES(dest,source) \ > +

Re: svn commit: r1329609 - in /subversion/trunk/subversion: include/svn_error.h libsvn_fs/fs-loader.c

Julian Foad wrote on Tue, Apr 24, 2012 at 16:14:46 +0100: > danie...@apache.org wrote: > > + * If EXPR is true, return a malfunction error whose chain includes ERR. > > + * If EXPR is false, do nothing.  (In particular, this does not clear ERR.) > > True and false are the wrong way around. Thanks

Re: svn commit: r1326337 - /subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c

stef...@apache.org wrote on Sun, Apr 15, 2012 at 13:42:44 -: > Author: stefan2 > Date: Sun Apr 15 13:42:44 2012 > New Revision: 1326337 > > URL: http://svn.apache.org/viewvc?rev=1326337&view=rev > Log: > Fix a macro redefinition warning for SYNCHRONIZE under Windows. > > * subversion/libsvn_s

Re: svn commit: r1329609 - in /subversion/trunk/subversion: include/svn_error.h libsvn_fs/fs-loader.c

danie...@apache.org wrote: > URL: http://svn.apache.org/viewvc?rev=1329609&view=rev > Log: > Follow-up to r1329601: > > * subversion/include/svn_error.h >   (SVN_ERR_ASSERT2): New. > > * subversion/libsvn_fs/fs-loader.c >   (svn_fs_commit_txn): Use new macro to not-leak errors upon asserting. >

Re: Merge policies

Paul Burba wrote on 2012-04-23: >>> Do you have a pointer to some details about how a mixed-rev target WC >>> is handled? > > (Julian, apologies if most of this is old-hat for you, I'm writing as > much for the newly involved folks as I am for you) Hi Paul.  Thanks for this detailed exposition

Re: Merge policies -- sparse, mixed-rev and switched target WCs

Paul Burba wrote: > On Fri, Apr 20, 2012 at 6:17 AM, Julian Foad wrote: >> I see there's already a brief statement about sparse WCs too: >> . >> I'm not clear how the whole 'depth' thing works,

Re: svn commit: r1329015 - in /subversion/trunk/subversion: include/private/svn_ra_private.h libsvn_ra/editor.c libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h

Greg Stein wrote on Mon, Apr 23, 2012 at 22:47:43 -0400: > On Apr 23, 2012 7:20 PM, "Hyrum K Wright" wrote: > > > > On Mon, Apr 23, 2012 at 4:55 PM, Greg Stein wrote: > > > On Mon, Apr 23, 2012 at 16:21, Hyrum K Wright > wrote: > > >> On Mon, Apr 23, 2012 at 12:52 PM, Greg Stein wrote: > > >>..

named atomic test spams /tmp

named_atomic-test doesn't clean up its tempfiles: % find /tmp -mtime -1 /tmp % ../runctest subr named_atomic ... % find /tmp -mtime -1 /tmp /tmp/svn-uOqtyy /tmp/svn-BXJBbj /tmp/svn-JoeKO3 % At a guess those are the three svn_io_file_del_none files from init_test_shm(). Can someone ensure they'r

Re: svn commit: r1329015 - in /subversion/trunk/subversion: include/private/svn_ra_private.h libsvn_ra/editor.c libsvn_ra/ra_loader.c libsvn_ra/ra_loader.h

On Mon, Apr 23, 2012 at 9:47 PM, Greg Stein wrote: > > On Apr 23, 2012 7:20 PM, "Hyrum K Wright" wrote: >> >> On Mon, Apr 23, 2012 at 4:55 PM, Greg Stein wrote: >> > On Mon, Apr 23, 2012 at 16:21, Hyrum K Wright >> > wrote: >> >> On Mon, Apr 23, 2012 at 12:52 PM, Greg Stein wrote: >> >>... >>

Re: update without changes: broken lock removed, no notifications generated

No, I'm not going to write a patch. Pointing to a certain line with a problem is the best I can do so far. > Dmitry Pavlenko writes: > > So I propose to add (lock_state != svn_wc_notify_lock_state_unchanged) > > condition somewhere to SVN 1.7 > > Sounds reasonable. Are you going to write a pa

RE: update without changes: broken lock removed, no notifications generated

> -Original Message- > From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of Philip > Martin > Sent: dinsdag 24 april 2012 14:48 > To: Dmitry Pavlenko > Cc: dev@subversion.apache.org > Subject: Re: update without changes: broken lock removed, no notifications > generated > >

Re: update without changes: broken lock removed, no notifications generated

Dmitry Pavlenko writes: > So I propose to add (lock_state != svn_wc_notify_lock_state_unchanged) > condition somewhere to SVN 1.7 Sounds reasonable. Are you going to write a patch? How about extending lock_tests.py:defunct_lock, or write a new test, to check the notification? >(maybe not only

Re: Always use SVN_ERR_ASSERT [was: svn commit: r1329234 - in /subversion/trunk: ./ subversion/libsvn_delta/compat.c]

Julian Foad wrote on Mon, Apr 23, 2012 at 21:11:30 +0100: > > > > > - Original Message - > > From: Daniel Shahaf > > To: Julian Foad > > Cc: Bert Huijben ; "dev@subversion.apache.org" > > > > Sent: Monday, 23 April 2012, 20:59 > > Subject: Re: Always use SVN_ERR_ASSERT [was: svn com

update without changes: broken lock removed, no notifications generated

Hello. (Tried with SVN r1297653) Please, consider the following scenario: We have a clean working copy at the latest revision (say, r1) with one file. 1. Set lock on a file file locally wc$ svn lock file .. 2. Unset lock on the file remotely wc$ svn unlock file:///url/for/file .. As re

Re: svn commit: r1329404 - in /subversion/trunk/subversion: include/private/ libsvn_client/ libsvn_wc/

Greg Stein wrote: > On Mon, Apr 23, 2012 at 15:44,  wrote: >> - * In @a *base_revision, return the revision of the revert-base, i.e. the >> - * revision that this node was checked out at or last updated/switched to, >> + * Set *REVISION, *REPOS_RELPATH, *REPOS_ROOT_URL and *REPOS_UUID to the >