1.7 fix necessary? file externals in unversioned subdirs

2011-08-30 Thread Neels J Hofmeyr
Ran a test that puts a file external inside an unversioned subdir. As soon as I have such a file external, running 'svn cleanup' (even though there's nothing to clean up) fails: [[[ svn: E155016: database inconsistency at local_relpath='X/UNV/xb' verifying expression 'have_a_parent_row' ]]] So we

Re: FSFS successor ID design draft

2011-08-30 Thread Neels J Hofmeyr
On 08/30/2011 06:34 PM, Hyrum K Wright wrote: > In reading through this, as well as the discussion in IRC, I'm once > again wondering why we're bolting this stuff onto the outside of FSFS > rather than rethinking the entire FS problem (along with things like > obliterate and move-to storage and ...

Re: Failing test svnsync_tests.py 28: copy and reencode non-UTF-8 svn:* props

2011-08-30 Thread David Darj
On 2011-08-28 20:34, Johan Corveleyn wrote: Hi, I get a test failure of svnsync_tests.py 28: copy and reencode non-UTF-8 svn:* props. The following error appears: svnsync: E720087: Can't convert string from 'ISO-8859-3' to 'UTF-8': svnsync: E720087: 2011-01-11T20:57:24.206641Z See also fails.l

Re: 1.7.0-rc2 up for signing / testing

2011-08-30 Thread Johan Corveleyn
On Tue, Aug 30, 2011 at 11:36 AM, Philip Martin wrote: > Johan Corveleyn writes: > >> Status against revision:      2 >> = >> Expected 'gamma' and actual 'gamma' in status tree are different! >> ==

Re: [PATCH] Don't repeatedly notify the same warning

2011-08-30 Thread C. Michael Pilato
On 08/30/2011 03:26 PM, C. Michael Pilato wrote: > On 08/30/2011 10:11 AM, Daniel Shahaf wrote: >> C. Michael Pilato wrote on Tue, Aug 30, 2011 at 10:01:26 -0400: >>> Would it make more sense to just replace the warning at the end with a >>> single instance of each of the various mid-stream warning

Re: [PATCH] Don't repeatedly notify the same warning

2011-08-30 Thread C. Michael Pilato
On 08/30/2011 10:11 AM, Daniel Shahaf wrote: > C. Michael Pilato wrote on Tue, Aug 30, 2011 at 10:01:26 -0400: >> Would it make more sense to just replace the warning at the end with a >> single instance of each of the various mid-stream warnings? Or are all such >> warnings not quite as redundant

Re: FSFS successor ID design draft

2011-08-30 Thread C. Michael Pilato
On 08/30/2011 12:34 PM, Hyrum K Wright wrote: >> There is at most one successor on the same line of history (same copy_id). >> Each copy operation also creates one new successor. > > I think we need to be bit more clear about when a successor is > actually created in the case of copy. For most

Re: [RFC] Refactoring some merge code - the repos-diff editor

2011-08-30 Thread Julian Foad
I (Julian Foad) wrote: > I (Julian Foad) wrote: > > I'm looking at merge code improvements, with the ultimate aim of > > functional improvements. My immediate aim is finding ways to > > restructure parts of the code to make it simpler to understand and > > easier to work with. > > > > Right now I

Re: Support for reverse merges?

2011-08-30 Thread Philip Martin
Paul Burba writes: > Could you provide some examples of when 'things start to go wrong when > you next try to use "automatic" merges between the branches'? Was > there a particular use-case (or cases) you had in mind, or just a > general sense that maybe this is/could be a problem? Here's one (

Re: Support for reverse merges?

2011-08-30 Thread Paul Burba
On Tue, Aug 30, 2011 at 12:30 PM, Julian Foad wrote: > Philip and I were discussing the other day... > > It seems that we don't consistently record a reverse merge.  Sometimes > we do, sometimes we don't. > >  * Iff this branch's mergeinfo mentions the change that we're > reverse-merging, then we

Re: FSFS successor ID design draft

2011-08-30 Thread Hyrum K Wright
I hope I'm not late to the party, but here are a couple of drive-by thoughts. On Fri, Aug 26, 2011 at 6:14 AM, Stefan Sperling wrote: > Below is an initial draft of a design for successor-IDs in FSFS. > It is a bit long, but I hope it covers all relevant points in > sufficient detail. > > Please

Support for reverse merges?

2011-08-30 Thread Julian Foad
Philip and I were discussing the other day... It seems that we don't consistently record a reverse merge. Sometimes we do, sometimes we don't. * Iff this branch's mergeinfo mentions the change that we're reverse-merging, then we remove the mention from the mergeinfo and so merge tracking can n

Re: FSFS successor ID design draft

2011-08-30 Thread Daniel Shahaf
Stefan Sperling wrote on Mon, Aug 29, 2011 at 18:01:38 +0200: > On Sat, Aug 27, 2011 at 02:15:31AM +0300, Daniel Shahaf wrote: > > > - cache can be regenerated on demand > > > > Regenerated *offline*, right? ie, if the cache is lost it can be > > derived from the revision files (which remain aut

Re: [PATCH] Don't repeatedly notify the same warning

2011-08-30 Thread Daniel Shahaf
C. Michael Pilato wrote on Tue, Aug 30, 2011 at 10:01:26 -0400: > On 08/28/2011 09:08 AM, Daniel Shahaf wrote: > > [[[ > > Make 'svnadmin dump' print the following warning: > > > > WARNING 0x0001: Mergeinfo referencing revision(s) prior to the > > oldest dumped revision (4). Loading this d

Re: [PATCH] Don't repeatedly notify the same warning

2011-08-30 Thread C. Michael Pilato
On 08/28/2011 09:08 AM, Daniel Shahaf wrote: > [[[ > Make 'svnadmin dump' print the following warning: > > WARNING 0x0001: Mergeinfo referencing revision(s) prior to the > oldest dumped revision (4). Loading this dump may result in invalid > mergeinfo. > > only once per dump operation

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

2011-08-30 Thread Daniel Shahaf
Greg Stein wrote on Tue, Aug 30, 2011 at 08:02:01 -0400: > Why the substitution of the "SVN_NO_ERROR" constant? Symmetry with the other branch of the ?: operator.

Re: [RFC] Refactoring some merge code - the repos-diff editor

2011-08-30 Thread Julian Foad
On Tue, 2011-08-30 at 12:46 +0100, Julian Foad wrote: > I'm looking at merge code improvements, with the ultimate aim of > functional improvements. My immediate aim is finding ways to > restructure parts of the code to make it simpler to understand and > easier to work with. > > Right now I'm loo

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

2011-08-30 Thread Greg Stein
On Aug 30, 2011 7:34 AM, wrote: >... > +++ subversion/trunk/subversion/tests/svn_test.h Tue Aug 30 11:33:32 2011 > @@ -57,13 +57,14 @@ extern "C" { > * EXPECTED must be a real error (neither SVN_NO_ERROR nor APR_SUCCESS). */ > #define SVN_TEST_ASSERT_ERROR(expr, expected) \ > do { \ > +sv

[RFC] Refactoring some merge code - the repos-diff editor

2011-08-30 Thread Julian Foad
I'm looking at merge code improvements, with the ultimate aim of functional improvements. My immediate aim is finding ways to restructure parts of the code to make it simpler to understand and easier to work with. Right now I'm looking at rationalizing the way a repos-repos diff is generated. In

[PATCH] Handle non-canonical fspaths in the authz file

2011-08-30 Thread Daniel Shahaf
Bringing it here as it's an incompatible change. If no objections I'll commit it for 1.8. [[[ Path-based authz: error out on non-canonical fspaths in the input. (We already canonicalize fspaths passed to the API for access testing.) This is an incompatible change: some previously-accepted authz

Re: svn commit: r1161219 - Auto-resolve 'local move vs. incoming edit'

2011-08-30 Thread Julian Foad
On Mon, 2011-08-29 at 13:27 +0200, Stefan Sperling wrote: > On Fri, Aug 26, 2011 at 05:27:16PM +0100, Julian Foad wrote: > > I (Julian Foad) wrote: > > > I was just cleaning up this editor, stripping out this "target" path > > > completely, so that it would simply pass relative paths out to the dif

Re: FSFS successor ID design draft

2011-08-30 Thread Stefan Sperling
On Mon, Aug 29, 2011 at 09:38:23PM -0400, C. Michael Pilato wrote: > You're using the term "cache" alot, which is definitely not the approach I > took with BDB. In the BDB code, a missing successor map entry would signify > a corruption of the filesystem. > Also, the BDB code does all this stuff

Re: Error tagging with ra_serf

2011-08-30 Thread Philip Martin
Hyrum K Wright writes: > In an effort to make sure my problems with serf are well known, I'm > posting this. I'm attempting to create a tag of a personal project, > and get the following error (over https, with the 1.7.x branch): > > [[[ > $ svn cp $REPOS/hikehy/trunk $REPOS/hikehy/releases/4.0.

Re: 1.7.0-rc2 up for signing / testing

2011-08-30 Thread Philip Martin
Johan Corveleyn writes: > Status against revision: 2 > = > Expected 'gamma' and actual 'gamma' in status tree are different! > = > EXPECTED NODE TO BE: > ==

Re: Recurse into same-repos externals at commit time.

2011-08-30 Thread Johan Corveleyn
On Tue, Aug 30, 2011 at 8:55 AM, Markus Schaber wrote: [...] >> Questions remain about passing externals explicitly: >> >> - when an external is passed as explicit target, still require --include- >> externals? > > IMHO: Do not require --include-externals. If I only want to commit a single > fi

Re: 1.7.0-rc2 up for signing / testing

2011-08-30 Thread Julian Foad
On Fri, 2011-08-26, Hyrum K Wright wrote: > After the much-ballyhooed RC1, I've re-rolled an RC2. You can fetch > the proposed tarballs from here: > http://people.apache.org/~hwright/svn/1.7.0-rc2/ Summary: +1 to release (Unix). My two signatures were successfully collected by your script.

Re: 1.7.0-rc2 up for signing / testing

2011-08-30 Thread Stefan Sperling
On Fri, Aug 26, 2011 at 10:38:18AM -0500, Hyrum K Wright wrote: > After the much-ballyhooed RC1, I've re-rolled an RC2. You can fetch > the proposed tarballs from here: > http://people.apache.org/~hwright/svn/1.7.0-rc2/ I think this is a very nice .0 release. It has received a good set of fixes