Fwd: buildbot failure in ASF Buildbot on svn-x64-centos-gcc

2012-04-27 Thread Greg Stein
Daniel: looks like some repos path leakage. -- Forwarded message -- From: build...@apache.org Date: Fri, Apr 27, 2012 at 02:12 Subject: buildbot failure in ASF Buildbot on svn-x64-centos-gcc To: notificati...@subversion.apache.org The Buildbot has detected a new failure on

Re: Fwd: buildbot failure in ASF Buildbot on svn-x64-centos-gcc

2012-04-27 Thread Daniel Shahaf
Greg Stein wrote on Fri, Apr 27, 2012 at 02:24:31 -0400: Daniel: looks like some repos path leakage. r1331287 should take care of all of these except stat_tests 19, which I believe Philip was looking into. (We know what needs to be done to make that test PASS.) Thanks! Daniel --

Re: nightly svn buildbot

2012-04-27 Thread Daniel Shahaf
It looks like a bug in nightly.sh, as opposed to in the build environment on the buildslave, so I think it's our responsibility to fix. I'm not volunteering. Greg Stein wrote on Fri, Apr 27, 2012 at 01:04:24 -0400: Hey all, Looks like the nightly buildbot needs some love. Maybe something as

Re: svn commit: r1325899 - in /subversion/trunk/subversion/libsvn_ra_svn: marshal.c ra_svn.h

2012-04-27 Thread Daniel Shahaf
Stefan Fuhrmann wrote on Fri, Apr 27, 2012 at 05:39:05 +0200: Am 26.04.2012 11:05, schrieb Daniel Shahaf: stef...@apache.org wrote on Fri, Apr 13, 2012 at 18:36:46 -: Author: stefan2 Date: Fri Apr 13 18:36:46 2012 New Revision: 1325899 URL:

Re: nightly svn buildbot

2012-04-27 Thread Gavin McDonald
Should have my Dev env box back up at new place tomorrow night , so I'll fix then (in either case) Gav... Sent from my iPhone On 27/04/2012, at 5:49 PM, Daniel Shahaf danie...@elego.de wrote: It looks like a bug in nightly.sh, as opposed to in the build environment on the buildslave, so I

Re: svn commit: r1330444 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

2012-04-27 Thread Julian Foad
Paul Burba wrote: On Thu, Apr 26, 2012 at 11:10 AM, Julian Foad wrote: Hi Paul.  Would you be willing to factor out those 40 lines of update-the-list code?  Then that part of the notification_receiver function can be as nice and readable as Sure, done r1331003. Thanks Paul.  Looks

Re: Symmetric merge -- tests

2012-04-27 Thread Julian Foad
Heads-up: I've added a test suite file, 'merge_symmetric_tests.py'.  Stefan^2, Cristian, Oleksiy... maybe you'd like to help out with this? This test file starts with depictions of the scenarios we're aiming to address.  So far, this is what I've come up with: #   Merge once # # A

Re: svn commit: r1331028 - in /subversion/trunk/subversion: include/svn_fs.h libsvn_fs/editor.c

2012-04-27 Thread Daniel Shahaf
gst...@apache.org wrote on Thu, Apr 26, 2012 at 18:47:32 -: Author: gstein Date: Thu Apr 26 18:47:31 2012 New Revision: 1331028 URL: http://svn.apache.org/viewvc?rev=1331028view=rev Log: Clarify that svn_fs_editor_commit() will either commit or abort the transaction. No need to worry

Re: authz_tests 7 FAIL with new revprop caching

2012-04-27 Thread Philip Martin
Philip Martin philip.mar...@wandisco.com writes: On my Linux machine svnserve with threading and revprop caching causes authz_tests 7 to FAIL: $ subversion/svnserve/svnserve --cache-revprops yes -Tdr subversion/tests/cmdline and $ ./authz_tests.py --url=svn://localhost 7 Getting lots

Re: svn commit: r1331242 - in /subversion/trunk/subversion: include/svn_error.h libsvn_subr/error.c

2012-04-27 Thread Hyrum K Wright
On Fri, Apr 27, 2012 at 1:32 AM, gst...@apache.org wrote: Author: gstein Date: Fri Apr 27 06:32:40 2012 New Revision: 1331242 URL: http://svn.apache.org/viewvc?rev=1331242view=rev Log: Fix error tracing to record file/line properly. When code said:  return svn_error_trace(foo()); It

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Greg Stein
On Wed, Apr 25, 2012 at 16:43, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: By clearing err we limit the information about the conflict to just the conflict path--if there is a more detailed explanation in err it is discarded.  Is that what we want?  The

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: On Wed, Apr 25, 2012 at 16:43, Philip Martin philip.mar...@wandisco.com wrote: Perhaps we should keep the error and toss the path? mod_dav_svn uses that path to construct a nice error message based on the context of the commit. mod_dav_svn isn't the

Re: svn commit: r1331447 - in /subversion/trunk/subversion:

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 10:55, Bert Huijben b...@vmoo.com wrote: ... This doesn't document the behavior of replacements within copies, nor with multi layer operations. And I would avoid the wc1 'revert base' as that can relate to op depth 0 or higher. I think it does. It says local-add

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 11:20, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: On Wed, Apr 25, 2012 at 16:43, Philip Martin philip.mar...@wandisco.com wrote: Perhaps we should keep the error and toss the path? mod_dav_svn uses that path to construct a

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Greg Stein
On Thu, Apr 26, 2012 at 10:06, Apache subversion Wiki comm...@subversion.apache.org wrote: ... + == Problem Cases == + + Move A to B: + + || op-depth || local-relpath || presence     || revision || repos || moved-to || + ||  0       ||    A          || normal       ||   1      ||   A   ||  

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: On Thu, Apr 26, 2012 at 10:06, Apache subversion Wiki comm...@subversion.apache.org wrote: ... + == Problem Cases == + + Move A to B: + + || op-depth || local-relpath || presence     || revision || repos || moved-to || + ||  0       ||    A          

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: On Fri, Apr 27, 2012 at 11:20, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: On Wed, Apr 25, 2012 at 16:43, Philip Martin philip.mar...@wandisco.com wrote: Perhaps we should keep the error and toss the path?

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Daniel Shahaf
Philip Martin wrote on Fri, Apr 27, 2012 at 18:29:09 +0100: Perhaps we should keep the current behaviour and return both an error and a path and let the caller decide which to one use. We could use the existing svn_error_t ** argument for that; the semantics would be that it is the post-commit

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 12:59, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: ... Wouldn't the B/f line at op_depth==1 have not-present to indicate that it was deleted? No.  Before delete: op-depth local-relpath presence   1        B           normal  

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 13:29, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: On Fri, Apr 27, 2012 at 11:20, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: On Wed, Apr 25, 2012 at 16:43, Philip Martin

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: Hmm. It seems there would be lots of problems with an 'svn move' of a mixed-revision working copy, once we record it as a true move. There are problems defining how it should behave. Stepping back, in 1.7, 'svn move' of a mixed-rev working copy is

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Stefan Sperling
On Fri, Apr 27, 2012 at 08:07:47PM +0100, Philip Martin wrote: Running update also makes mixed-rev source into single-rev so I'd be happy not to support mixed-rev move, except that update a single-rev tree from one rev to another goes through mixed-rev. IMO we don't need to support mixed-rev

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: The current err-message says Conflict at '/some/path'. (no real context) mod_dav_svn returns a message such as: A conflict occurred during the CHECKIN processing. The problem occurred with the \%s\ resource. or Conflict when committing '%s'. or A

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 15:15, Stefan Sperling s...@elego.de wrote: On Fri, Apr 27, 2012 at 08:07:47PM +0100, Philip Martin wrote: Running update also makes mixed-rev source into single-rev so I'd be happy not to support mixed-rev move, except that update a single-rev tree from one rev to

Re: [Subversion Wiki] Update of MultiLayerMoves by PhilipMartin

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 15:07, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: ... Stepping back, in 1.7, 'svn move' of a mixed-rev working copy is actually just a set of copies (followed by a big delete). Each time a revision differs from its parent, it

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Greg Stein
On Fri, Apr 27, 2012 at 15:25, Philip Martin philip.mar...@wandisco.com wrote: Greg Stein gst...@gmail.com writes: The current err-message says Conflict at '/some/path'. (no real context) mod_dav_svn returns a message such as: A conflict occurred during the CHECKIN processing. The problem

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Philip Martin
Greg Stein gst...@gmail.com writes: And that pattern was very annoying. Today, you can SVN_ERR(svn_fs_editor_commit(...)). With the pattern you're suggesting, it gets uglier: err = svn_fs_editor_commit(...); if (SVN_IS_VALID_REVNUM(revision)) ... do some stuff else if (err ==

Re: Queries on two instances of __bind_int64(revnum) in WC

2012-04-27 Thread Julian Foad
Can anyone advise on these? One point being the semantics is different: _bind_revnum sets column to NULL for INVALID_REVNUM. Don't know if INVALID_REVNUM ever can hit these two particular code paths. - Julian Index: subversion/libsvn_wc/entries.c

Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

2012-04-27 Thread Greg Stein
I'm growing weary of this. Daniel and I spent a couple hours discussing calling patterns, error states, and everything. This felt the best approach. If you have a concrete suggestion, and a patch, then I'll take a look. -g On Fri, Apr 27, 2012 at 16:02, Philip Martin philip.mar...@wandisco.com

Fwd: svn commit: r1331652 - /subversion/trunk/subversion/libsvn_delta/compat.c

2012-04-27 Thread Greg Stein
Hyrum, I think you're going to like this one :-) ... all of the build() and operation stuff is now gone. Rather than path elements and intermediate batons manually, I switched the code to rely on the path_driver. It also shares the change_node structure with the Ev1/Ev2 shim. In essence, struct

Re: svn commit: r1331652 - /subversion/trunk/subversion/libsvn_delta/compat.c

2012-04-27 Thread Hyrum K Wright
Hey cool! I'm glad my first hack at the backward compat code is getting a good look / knife. As an aside: I'm going to be preoccupied by other stuff for the next several days, but hope to dig back in towards the end of next week, if you haven't finished all the Ev2 work by then. :P -Hyrum On

Re: svn commit: r1331652 - /subversion/trunk/subversion/libsvn_delta/compat.c

2012-04-27 Thread Greg Stein
btw, I fixed log 38, and am re-running tests to ensure that my hacky fix doesn't break other stuff. merge 105 is unrelated to the shims, and will send separate email. On Fri, Apr 27, 2012 at 22:10, Hyrum K Wright hyrum.wri...@wandisco.com wrote: Hey cool!  I'm glad my first hack at the backward

merge 105, issue 3115: case-only rename merges

2012-04-27 Thread Greg Stein
Hey Paul, I think that I just found a bug in case-only renames, via merge_tests 105. When the merge -r2:3 is done into the working copy, there are two possible outcomes: GOOD: 2012-04-27 22:21:59 [INFO] --- Merging r3 into 'svn-test-work/working_copies/merge_tests-105/A_COPY': 2012-04-27