Re: Why merge is so slow? (was Re: svn commit: r926210 - /subversion/trunk/notes/meetings/svn-vision-agenda)

2010-03-23 Thread Stefan Sperling
On Tue, Mar 23, 2010 at 08:32:32AM -0400, Mark Phippard wrote: > On Tue, Mar 23, 2010 at 8:28 AM, Stefan Sperling wrote: > > > In most setups I've seen the server hardware is much beefier than > > the client hardware, so unless we do things that scale really badly >

Re: svnserve and sasl cross-realm (was: svnserve and ldap status ?)

2010-03-23 Thread Stefan Sperling
On Tue, Mar 23, 2010 at 03:58:50PM -0500, Alec Kloss wrote: > Now please see attached. Thanks. I'll try to look at this soon. I've also downloaded a couple of related RFCs (e.g. RFC4422) for reference, as well as cyrus-sasl source code -- the binaries are already installed cause sendmail uses the

Re: svn commit: r927620 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/patch.c svn/patch-cmd.c tests/libsvn_client/ tests/libsvn_client/client-test.c

2010-03-26 Thread Stefan Sperling
Hey Bert, Philip, Thanks for fixing these. I knew the test was rough and I was meaning to revisit it, but you found and fixed more problems than I was aware of :) I'll check back on the test on monday the latest. Stefan

Re: Will subversion participate in Google Summer of Code 2010?

2010-03-26 Thread Stefan Sperling
On Fri, Mar 19, 2010 at 04:44:22PM +0100, Stefan Sperling wrote: > On Fri, Mar 19, 2010 at 08:10:27PM +0530, Azhagu Selvan wrote: > > There's no mention of subversion ideas in asf-gsoc page. Any updates > > on this? > > I haven't gotten around to putting the idea

Re: svn commit: r919460 - filtering svn patch targets

2010-03-26 Thread Stefan Sperling
On Wed, Mar 10, 2010 at 06:56:12PM +0100, Stefan Küng wrote: > And it would be great if I could tell where to save the result, i.e. > not having the patch applied to the target file but to a copy of > that file instead so I can show the user a preview of the result > without actually modifying the

Re: svn commit: r919460 - filtering svn patch targets

2010-03-27 Thread Stefan Sperling
On Fri, Mar 26, 2010 at 07:57:09PM +0100, Stefan Küng wrote: > On 26.03.2010 18:17, Stefan Sperling wrote: > >Can you check if the current API matches your requirements? > >See subversion/tests/libsvn_client/client-test.c for a trivial example. > > Looks very good! Thanks a

patch conflicts (Re: svn commit: r928900 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-30 Thread Stefan Sperling
On Mon, Mar 29, 2010 at 09:10:46PM -, gst...@apache.org wrote: > Author: gstein > Date: Mon Mar 29 21:10:46 2010 > New Revision: 928900 > > @@ -187,3 +208,6 @@ hunk as written to the .svnpatch.rej fil > ### The pristine store needs all references to be stored in a DB column. > ### To

allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-30 Thread Stefan Sperling
On Mon, Mar 29, 2010 at 03:37:51PM -, rhuij...@apache.org wrote: > Author: rhuijben > Date: Mon Mar 29 15:37:50 2010 > New Revision: 928806 > > URL: http://svn.apache.org/viewvc?rev=928806&view=rev > Log: > * notes/wc-ng/conflict-storage > Update schema to have some global information that a

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 05:55:00PM +0200, Bert Huijben wrote: > > > > -Original Message- > > From: Stefan Sperling [mailto:s...@elego.de] > > Sent: dinsdag 30 maart 2010 16:30 > > To: dev@subversion.apache.org > > Cc: comm...@subversion.apache.org >

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 06:14:50PM +0200, Stefan Sperling wrote: > I want the storage layer to care about storage, not about policy. FWIW, this diff changes the spec accordingly. Note how the "patch" conflict type does not use the COMMON data at all. Any really strong reason not

Re: allowing multiple conflicts in storage

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 05:56:54PM +0100, Julian Foad wrote: > > > Conflict meta data storage in wc-ng > > === > > > > Conflict meta data is stored in the ACTUAL_NODE table, within the > > 'conflict_data' column. The data in this column is a skel containing > > con

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 07:14:41PM +0200, Stefan Sperling wrote: > On Tue, Mar 30, 2010 at 06:14:50PM +0200, Stefan Sperling wrote: > > I want the storage layer to care about storage, not about policy. > > FWIW, this diff changes the spec accordingly. Note how the "patch"

Re: description of Peg Revision Algorithm is incomplete

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 03:21:45PM -0400, C. Michael Pilato wrote: > Vincent Lefevre wrote: > > On 2010-03-30 12:12:59 -0400, C. Michael Pilato wrote: > >> Interactions in the working copy with the path some/file.c only make sense > >> if there is actually such a path in the working copy. If some/

Re: [PATCH] Fix svnversion message as follow-up to r922176

2010-03-30 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 10:14:42PM +0200, Daniel Näslund wrote: > Ping! This patch has not been reviewed! > > On Sun, Mar 14, 2010 at 09:38:15PM +0100, Daniel Näslund wrote: > > Hi! > > > > The 1.6 svnversion message was "'path' not versioned, and not exported". > > But on trunk more than one mes

Re: redundant path functions

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 11:34:35AM +0200, Bert Huijben wrote: > > > > -Original Message- > > From: Greg Stein [mailto:gst...@gmail.com] > > Sent: woensdag 31 maart 2010 2:47 > > To: dev@subversion.apache.org > > Subject: redundant path functions > > > > The following functions seem very

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 09:50:33AM +0200, Bert Huijben wrote: > > -Original Message- > > From: Stefan Sperling > > Why not allow application of a patch which carries a diff that would > > not > > touch a conflicted property before the user has dealt with prop

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-31 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 08:04:55PM +0200, Stefan Sperling wrote: > Actually, I think this becomes much cleaner once we recognize > that what's right now stored in COMMON is actually operation-specific. I've committed this in r929504. We can still move the OPERATION skels around,

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 01:44:23PM +0100, Julian Foad wrote: > The Source of the Incoming Change > = > > I suggest something like (? means an optional field): > > * A diff between nodes that have a location in a repository. > > left=(repo, rev, relpath, sh

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 02:14:13PM +0100, Julian Foad wrote: > Where I talk about "libsvn_wc versus libsvn_client", I didn't mean that, > I meant two sub-layers within libsvn_wc, the lower layer that handles > purely storage versus the upper layer that performs updates etc. and > needs to write the

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 07:34:41PM +0100, Julian Foad wrote: > OK I've attached a patch with ideas and suggestions. (The above was > meant to be a concept that should be embodied in the design, not a > design in itself.) I like it, please commit! > In my dream world, the logic of "update" is > h

Re: [PATCH] v4 Fix svnversion message as follow-up to r922176

2010-04-02 Thread Stefan Sperling
On Fri, Apr 02, 2010 at 11:06:32AM +0200, Daniel Näslund wrote: > gstein pointed out that I should use SVN_IS_VALID_REVNUM(). Fixed! > @@ -290,6 +290,16 @@ main(int argc, const char *argv[]) >return EXIT_FAILURE; > } > > + if (SVN_IS_VALID_REVNUM(res->min_rev)) Doesn't this revers

Re: svn commit: r930662 - in /subversion/branches/svn-patch-improvements/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2010-04-04 Thread Stefan Sperling
On Sun, Apr 04, 2010 at 10:55:26AM -, dan...@apache.org wrote: > Author: dannas > Date: Sun Apr 4 10:55:25 2010 > New Revision: 930662 > > URL: http://svn.apache.org/viewvc?rev=930662&view=rev > Log: > Make 'svn patch' able to remove dirs beeing empty after patching, taking > into account bot

Re: FW: svn commit: r930702 - /subversion/trunk/subversion/tests/libsvn_client/client-test.c

2010-04-04 Thread Stefan Sperling
On Sun, Apr 04, 2010 at 05:33:22PM +0200, Bert Huijben wrote: > > -Original Message- > > From: rhuij...@apache.org [mailto:rhuij...@apache.org] > > Sent: zondag 4 april 2010 17:31 > > To: comm...@subversion.apache.org > > Subject: svn commit: r930702 - > > /subversion/trunk/subversion/tests

Re: FW: svn commit: r930702 - /subversion/trunk/subversion/tests/libsvn_client/client-test.c

2010-04-04 Thread Stefan Sperling
On Sun, Apr 04, 2010 at 06:14:49PM +0200, Stefan Sperling wrote: > I'm not sure why the test ends up writing "\n" EOL terminators on windows. The reason is probably that all files created in the greek tree use "\n". Note that the patched_tempfile isn't actu

Re: [RFC] Proposal for GSoC project - extend 'svn {patch,diff}' with git unidiff format

2010-04-05 Thread Stefan Sperling
On Mon, Apr 05, 2010 at 10:02:56AM +0200, Daniel Näslund wrote: > Hi! > > I'm supposed to send this proposal to the Google Summer of Code > machinery and let it be forwarded to the interrested mentor of the > Subversion community, in this case Stefan. In the interrest of openess > I'm posting it h

Re: Subversion Vision and Roadmap Proposal

2010-04-05 Thread Stefan Sperling
On Mon, Apr 05, 2010 at 04:14:21PM +0200, Martin Hauner wrote: > Simplicity... actually I think subversion could or should be even > simpler. It may be easy from our point of view around here but when > I see how people use it, it still seems to be too complicated. One > has to draw a line at some

Re: Properties (was Re: Subversion Vision and Roadmap Proposal)

2010-04-05 Thread Stefan Sperling
On Mon, Apr 05, 2010 at 07:28:57PM +0200, Martin Hauner wrote: > Hi, > > On 05.04.10 17:06, Stefan Sperling wrote: > >On Mon, Apr 05, 2010 at 04:14:21PM +0200, Martin Hauner wrote: > >[..] > >>In case of merging (mostly cherry picking from trunk to live and &g

Re: 1.6.10 up for testing/signing

2010-04-06 Thread Stefan Sperling
On Mon, Apr 05, 2010 at 10:30:06PM -0400, C. Michael Pilato wrote: > Paul Burba wrote: > > P.S. There are clearly some opportunities in this code to be more > > conservative in requesting access to the repos root. If > > REPOS_REL_PATH has explicit mergeinfo we only need access to that > > path.

Re: Subversion Vision and Roadmap Proposal

2010-04-06 Thread Stefan Sperling
On Tue, Apr 06, 2010 at 07:04:42AM +0200, Branko Čibej wrote: > On 05.04.2010 17:06, Stefan Sperling wrote: > > An idea we're playing with to mitigate this problem is having designated > > properties in the svn: namespace which allow users to tell svn what their > > bra

Re: 1.6.10 up for testing/signing

2010-04-06 Thread Stefan Sperling
On Tue, Apr 06, 2010 at 08:51:07AM -0400, C. Michael Pilato wrote: > Stefan Sperling wrote: > > Should we delay the #3242 fix until 1.6.12 and release 1.6.11 ASAP? > > That would give us plenty of time to do the #3242 backport properly, > > and would give users access to the

Re: Subversion Vision and Roadmap Proposal

2010-04-06 Thread Stefan Sperling
On Tue, Apr 06, 2010 at 10:31:56AM -0400, Bob Archer wrote: > > On Tue, Apr 06, 2010 at 07:04:42AM +0200, Branko Čibej wrote: > > > On 05.04.2010 17:06, Stefan Sperling wrote: > > > > An idea we're playing with to mitigate this problem is having > > de

reflective merges (was: Re: svn commit: r931164 - /subversion/branches/svn-patch-improvements/)

2010-04-06 Thread Stefan Sperling
On Tue, Apr 06, 2010 at 09:32:00AM -0500, Hyrum K. Wright wrote: > I'm interested to know why this is needed. Is our merge tracking > implementation so broken that it doesn't handle these types of things? Short version: The implementation isn't broken, but the design is broken. (The problem was

Re: svn commit: r930990 - /subversion/trunk/subversion/tests/cmdline/patch_tests.py

2010-04-06 Thread Stefan Sperling
On Tue, Apr 06, 2010 at 12:44:34AM -, rhuij...@apache.org wrote: > Author: rhuijben > Date: Tue Apr 6 00:44:34 2010 > New Revision: 930990 > > URL: http://svn.apache.org/viewvc?rev=930990&view=rev > Log: > Properly close temporary file handles to allow the delete of the > temporary files to s

Re: Subversion Vision and Roadmap Proposal

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 12:13:56AM -0400, Greg Stein wrote: > On Thu, Apr 8, 2010 at 22:55, Tim Starling wrote: > > C. Michael Pilato wrote: > >> We need to find a way to embrace and > >> empower would-be Subversion contributors. > > > > You could start by replying to their mailing list posts. Jus

Re: Pushmi support

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 03:36:10PM +0100, Philip Martin wrote: > Tim Starling writes: > > > That was my fourth post to this list, I was referring to the other > > three, particularly: > > > >

Re: svn commit: r932469 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: > On Fri, Apr 9, 2010 at 11:46, wrote: > >... > > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr  9 > > 15:46:17 2010 > > @@ -18792,7 +18792,7 @@ def reintegrate_with_subtree_merges(sbox > >     'D/H/omega' : Item(

Re: misaligned blame output if repo has >1m revisions

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 10:17:12PM +0200, Johan Corveleyn wrote: > Hi devs, > > Just a heads up, not really important, but I came across this in > blame_cmd.c (inside print_line_info): > > [[[ > const char *rev_str = SVN_IS_VALID_REVNUM(revision) > ? apr_psprintf(pool, "%6ld", revision) >

Re: Subversion Vision and Roadmap Proposal

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 04:39:08PM -0400, Mark Mielke wrote: > In fact, I've found it a bit difficult to reliable say "what > revision of trunk was this tag created from?" I think the > information is in the copy-from attribute in the underlying FSFS > commit, but the last time I tried to get acces

Re: Subversion Vision and Roadmap Proposal

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 10:29:30PM +0100, Stefan Sperling wrote: > On Fri, Apr 09, 2010 at 04:39:08PM -0400, Mark Mielke wrote: > > Branch is similar. If I want to set to the point on trunk at which > > branches/2.0 was branched, how do I do this? > > In GIT, it's just &

Re: svn commit: r932635 - /subversion/trunk/subversion/libsvn_repos/reporter.c

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 03:15:21PM -0700, Blair Zajac wrote: > On 04/09/2010 03:08 PM, s...@apache.org wrote: > >Author: stsp > >Date: Fri Apr 9 22:08:40 2010 > >New Revision: 932635 > > > >URL: http://svn.apache.org/viewvc?rev=932635&view=rev > >Log: > >* subversion/libsvn_repos/reporter.c > >

Re: svn commit: r932469 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2010-04-09 Thread Stefan Sperling
On Fri, Apr 09, 2010 at 06:27:18PM -0400, Greg Stein wrote: > On Fri, Apr 9, 2010 at 16:54, Stefan Sperling wrote: > > On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: > >> On Fri, Apr 9, 2010 at 11:46,   wrote: > >> >... > >> > +++

Re: [PATCH] sasl service name for svnserve

2010-04-10 Thread Stefan Sperling
On Wed, Mar 03, 2010 at 03:22:55PM +0500, Катаргин Алексей wrote: > Hello, guys! > > I wrote a patch for svnserve. It allows you to specify sasl service > > name for each repository using the directive "sasl-service-name" > > in section [sasl] in svnserve.conf for the repository. This is neces

Re: svn commit: r932796 - /subversion/trunk/subversion/libsvn_wc/wc_db.h

2010-04-11 Thread Stefan Sperling
On Sat, Apr 10, 2010 at 08:41:31PM -0400, Greg Stein wrote: > On Sat, Apr 10, 2010 at 18:08, wrote: > > Author: stsp > > Date: Sat Apr 10 22:08:37 2010 > > New Revision: 932796 > > > > URL: http://svn.apache.org/viewvc?rev=932796&view=rev > > Log: > > Add sketchy declarations of functions wrting

Re: Subversion Vision and Roadmap Proposal

2010-04-11 Thread Stefan Sperling
On Sat, Apr 10, 2010 at 11:38:22PM -0700, Alexey Neyman wrote: > 2. In the same issue, there is a reference to keyword substitution > implementation used by FreeBSD. Again, no further description as to why this > implementation was not acceptable, etc. There was, in this thread: http://svn.haxx.

Re: [PATCH] sasl service name for svnserve

2010-04-12 Thread 'Stefan Sperling'
On Mon, Apr 12, 2010 at 10:33:03AM +0600, Катаргин Алексей wrote: > -Original Message- > From: Stefan Sperling > >The patch looks technically correct, but I don't understand why it is > >needed. Can you explain why it is needed? > > > >It sound

Re: svn commit: r930662 - in /subversion/branches/svn-patch-improvements/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2010-04-13 Thread Stefan Sperling
On Sun, Apr 04, 2010 at 01:20:09PM +0200, Stefan Sperling wrote: > On Sun, Apr 04, 2010 at 10:55:26AM -, dan...@apache.org wrote: > > Author: dannas > > Date: Sun Apr 4 10:55:25 2010 > > New Revision: 930662 > > > > URL: http://svn.apache.org/viewvc?rev=93066

deleting working copy root

2010-04-14 Thread Stefan Sperling
Hi, deleting the working copy root doesn't work (and I don't it think should), but the error message we print is somewhat confusing: $ pwd /tmp/svn-sandbox/trunk $ svn rm . subversion/svn/delete-cmd.c:91: (apr_err=155007) subversion/svn/util.c:900: (apr_err=155007) subversion/libsvn_

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 04:21:56PM +0200, Daniel Näslund wrote: > Hi! > > #3610 [1] is about ignoring white space changes to be able to apply > patches that have been mangled, i.e. a mailing software converting tabs > to spaces, removing trailing white spaces or leading white spaces. > > It means

Re: svn commit: r933767 - in /subversion/branches/svn-patch-improvements/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 03:48:49PM +0100, Julian Foad wrote: > On Tue, 2010-04-13, s...@apache.org wrote: > > (push_if_unique): New helper function, needed because we do not use > >a hash table anymore to ensure path uniqueness. > > Why not use a hash table? It looks like doing so would hav

Re: svn commit: r933767 - in /subversion/branches/svn-patch-improvements/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 12:21:02PM -0400, Greg Stein wrote: > On Tue, Apr 13, 2010 at 15:45, wrote: > >... > > +++ > > subversion/branches/svn-patch-improvements/subversion/libsvn_client/patch.c > > Tue Apr 13 19:45:17 2010 > >... > > +  /* Finally, delete empty directories. */ > > +  for (i =

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 05:49:51PM +0200, Daniel Näslund wrote: > On Wed, Apr 14, 2010 at 05:35:36PM +0200, Stefan Sperling wrote: > > I.e. we'll add some optional magic in match_hunk(), making it skip over > > whitespace on either side (as determined by isspace()), but com

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 09:27:25PM +0200, Daniel Näslund wrote: > On Wed, Apr 14, 2010 at 08:18:06PM +0200, Alan Barrett wrote: > > I don't buy the argument that it's necessary, for consistency with > > current svn behaviour, to copy context lines from the patch to > > the output file. It is consi

Re: [RFC] Issue #3603 Fix - Should we do more?

2010-04-14 Thread Stefan Sperling
On Wed, Apr 14, 2010 at 03:36:31PM -0400, C. Michael Pilato wrote: > I would feel more warm and fuzzy if > I knew that the tree conflict information that we leave around is clear > about the reason for the conflict. That a missing-due-to-sparse-checkouts > directory is the reason for the conflict,

Re: Mark/seek/reset problems in svn_subst_stream_translated()

2010-04-15 Thread Stefan Sperling
On Thu, Apr 15, 2010 at 02:18:22PM +0100, Julian Foad wrote: > I noticed some oddities/problems with the stream mark/seek/reset > functionality in svn_subst_stream_translated(). > > 1. > svn_subst_stream_translated() doesn't handle mark/seek properly. > translated_stream_mark() saves and translate

Re: Mark/seek/reset problems in svn_subst_stream_translated()

2010-04-15 Thread Stefan Sperling
On Thu, Apr 15, 2010 at 11:28:13AM -0400, Greg Stein wrote: > I'd suggest that we simply remove mark/seek/reset from the translated stream. We could not handle keywords or newlines during patching if we did that. > (I was never comfortable with that extension to our streams in the > first place,

Re: Mark/seek/reset problems in svn_subst_stream_translated()

2010-04-15 Thread Stefan Sperling
On Thu, Apr 15, 2010 at 05:36:36PM +0100, Julian Foad wrote: > I (Julian Foad) wrote: > > The "line filter" and "line transformer": I don't think these fit the > > stream abstraction at all well. Streams don't have "lines" as a primary > > concept. Without going into the details, I think it can't

Re: Patch branch

2010-04-15 Thread Stefan Sperling
On Thu, Apr 15, 2010 at 05:59:47PM -0400, Greg Stein wrote: > Now that dannas has full privs, please dev on trunk, rather than the branch. Yup, already arranged :) -- Sent from my Nokia 1100

Re: svn commit: r934627 - in /subversion/trunk: ./ subversion/libsvn_client/patch.c subversion/tests/cmdline/patch_tests.py

2010-04-16 Thread Stefan Sperling
On Fri, Apr 16, 2010 at 10:08:15AM +0100, Philip Martin wrote: > s...@apache.org writes: > > > Author: stsp > > Date: Thu Apr 15 22:18:59 2010 > > New Revision: 934627 > > > > URL: http://svn.apache.org/viewvc?rev=934627&view=rev > > Log: > > Reintegrate the svn-patch-improvements branch into trun

Re: 1.6.11 tarballs up for testing/signing

2010-04-16 Thread Stefan Sperling
On Thu, Apr 15, 2010 at 12:18:58PM -0500, Hyrum K. Wright wrote: > 1.6.11 tarballs are up, the magic revision is r934486: > > http://people.apache.org/~hwright/svn/1.6.11/ > > This differs very little from 1.6.10, but it does have important fixes which > have been spot tested. Please do you stan

Re: svn commit: r934627 - in /subversion/trunk: ./ subversion/libsvn_client/patch.c subversion/tests/cmdline/patch_tests.py

2010-04-16 Thread Stefan Sperling
On Fri, Apr 16, 2010 at 11:38:41AM +0100, Philip Martin wrote: > Julian Foad writes: > > Just write "arr->nelts = 0;" (which is the entire body of > > apr_array_clear()) and don't introduce an ifdef. I'm a bit sceptical. Do we really want to rely on implementation details like "arr->nelts = 0" in

Re: 1.6.11 tarballs up for testing/signing

2010-04-16 Thread Stefan Sperling
On Fri, Apr 16, 2010 at 09:45:16AM -0400, Paul Burba wrote: > I just double checked this test, running with both a debug and release > build, both pass. > > You probably already noticed, but the dry-run and full-merge outputs > are semantically equivalent. The only differences are the ordering of

Re: svn commit: r934627 - in /subversion/trunk: ./ subversion/libsvn_client/patch.c subversion/tests/cmdline/patch_tests.py

2010-04-16 Thread Stefan Sperling
On Fri, Apr 16, 2010 at 10:50:22AM -0500, Hyrum K. Wright wrote: > This was causing some of the buildbots not to be able to build, so I went > ahead and committed a fix in r934969. Thanks! Stefan

Re: svn commit: r937276 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

2010-04-23 Thread Stefan Sperling
On Fri, Apr 23, 2010 at 01:04:37PM -, gst...@apache.org wrote: > Author: gstein > Date: Fri Apr 23 13:04:37 2010 > New Revision: 937276 > This breaks schedule_tests 7, to be fixed in a larger and distinct > semantic change/revision. Why not mark it XFAIL in the meantime? Stefan

Re: svn commit: r937275 - in /subversion/trunk/subversion: include/svn_subst.h libsvn_subr/subst.c

2010-04-23 Thread Stefan Sperling
On Fri, Apr 23, 2010 at 01:01:24PM -, s...@apache.org wrote: > Author: stsp > Date: Fri Apr 23 13:01:23 2010 > New Revision: 937275 > > URL: http://svn.apache.org/viewvc?rev=937275&view=rev > Log: > Pool usage fixes in the translation stream. > > Do not maintain a private pool for each transl

Re: [PATCH] issue #3620: svn add ^/ triggers assertion failure

2010-04-23 Thread Stefan Sperling
On Fri, Apr 23, 2010 at 12:46:44PM -0400, C. Michael Pilato wrote: > As I noted, the check needs to happen inside the client API. The question > becomes "Do we patch svn_client_addX() and svn_client_statusX() and > svn_client_updateX() and ..." or is there a more general fix to be made > (like per

Re: Hosting tarballs on ASF infrastructure

2010-04-26 Thread Stefan Sperling
On Mon, Apr 26, 2010 at 11:20:52AM -0500, Hyrum K. Wright wrote: > On Mon, Apr 26, 2010 at 11:06 AM, Mark Phippard wrote: > > > On Mon, Apr 26, 2010 at 11:44 AM, Hyrum K. Wright > > wrote: > > I was under the impression we couldn't post it unless we remove Neon > > and maybe other parts. > > > >

Re: patch API review

2010-04-28 Thread Stefan Sperling
On Wed, Apr 28, 2010 at 10:05:58AM -0500, Hyrum K. Wright wrote: > I'm looking at adding support for the patch client API to JavaHL, but in > doing so, I have a few questions about the API itself. I'm pretty late the > game, so these questions might already be answered. If so, please point me > t

Re: what's up with r842347's log message?

2010-05-01 Thread Stefan Sperling
On Sat, May 01, 2010 at 01:45:53PM -0400, Greg Stein wrote: > The log on r842347 (aka r2273) looks wrong. What happened to it? What are you seeing? I'm getting: r842347 | cmpilato | 2002-06-18 22:14:56 +0200 (Tue, 18 Jun 20

Re: Multiple matching lines in authz file

2010-05-02 Thread Stefan Sperling
On Wed, Jan 27, 2010 at 01:49:18PM +0200, Mark Cammidge wrote: > Stefan Sperling wrote: > > >> Does anybody object if I create an issue in the documentation issue > >> tracker? I'll create a patch to the English documentation to go with > >> the issue. >

Re: More details of commit/update steps

2010-05-03 Thread Stefan Sperling
On Sun, May 02, 2010 at 11:44:32PM +0200, Asier Marzo Pérez wrote: > Hi, > > I'm really interested in knowing more details of commit/update > machanism, I've read several times this website > http://svn.apache.org/repos/asf/subversion/trunk/notes/subversion-design.html > and the information is rea

Re: svn commit: r937275 - in /subversion/trunk/subversion: include/svn_subst.h libsvn_subr/subst.c

2010-05-03 Thread Stefan Sperling
On Mon, Apr 26, 2010 at 11:40:41AM -0400, Greg Stein wrote: > On Mon, Apr 26, 2010 at 06:54, Julian Foad wrote: > > On Fri, 2010-04-23, Stefan Sperling wrote: > >> On Fri, Apr 23, 2010 at 01:01:24PM -, s...@apache.org wrote: > >... > >> > +++ subversion/

Re: Paths in the client patch code

2010-05-04 Thread Stefan Sperling
On Tue, May 04, 2010 at 10:54:51AM +0200, Hyrum K. Wright wrote: > I see a lot of paths in the client patch code, but few of the variable names > are explicit about whether the path is absolute or relative. Can somebody > who knows the code comment on what types of paths it uses? If we do know, >

Re: Paths in the client patch code

2010-05-04 Thread Stefan Sperling
On Tue, May 04, 2010 at 11:30:07AM +0200, Hyrum K. Wright wrote: > On Tue, May 4, 2010 at 11:13 AM, Stefan Sperling wrote: > > > On Tue, May 04, 2010 at 10:54:51AM +0200, Hyrum K. Wright wrote: > > > I see a lot of paths in the client patch code, but few of the variabl

Re: svn commit: r940786 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/patch.c svn/patch-cmd.c tests/libsvn_client/client-test.c

2010-05-04 Thread Stefan Sperling
On Tue, May 04, 2010 at 09:45:44AM -, hwri...@apache.org wrote: > Author: hwright > Date: Tue May 4 09:45:43 2010 > New Revision: 940786 > > URL: http://svn.apache.org/viewvc?rev=940786&view=rev > Log: > Add a callback to the public patch API, to allow consumers to collect > information about

Re: svn commit: r940786 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/patch.c svn/patch-cmd.c tests/libsvn_client/client-test.c

2010-05-04 Thread Stefan Sperling
On Tue, May 04, 2010 at 11:36:49AM +0100, Julian Foad wrote: > Wasn't the idea that the caller could choose whether the patched result > should be written straight to the target file or to somewhere else? No, that wasn't the idea. The patched result is *always* written to tempfiles first. Always

Re: [PATCH] sasl service name for svnserve

2010-05-04 Thread 'Stefan Sperling'
On Tue, Apr 13, 2010 at 10:33:47AM +0600, Катаргин Алексей wrote: > -Original Message- > From: 'Stefan Sperling' [mailto:s...@elego.de] > Sent: Monday, April 12, 2010 10:05 PM > To: Катаргин Алексей > Cc: dev@subversion.apache.org; n...@chelcom.ru > Subject: R

Re: svnserve and sasl cross-realm (was: svnserve and ldap status ?)

2010-05-04 Thread Stefan Sperling
On Tue, Mar 23, 2010 at 10:16:25PM +0100, Stefan Sperling wrote: > On Tue, Mar 23, 2010 at 03:58:50PM -0500, Alec Kloss wrote: > > Now please see attached. > > Thanks. I'll try to look at this soon. > > I've also downloaded a couple of related RFCs (e.g. RFC44

Re: another hole in tree-conflicts! -- was: Re: svn commit: r940111 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_wc/node.c libsvn_wc/status.c svn/cl.h

2010-05-05 Thread Stefan Sperling
On Wed, May 05, 2010 at 11:37:09AM +0200, Neels J Hofmeyr wrote: > Ok, even furthermore, say there is nothing, absolutely nothing at WC path > foo.c, and I do a two-URL merge. The URL I merge from has foo.c on the left, > but no foo.c on the right. So technically, the merge should want to delete >

Re: [PATCH] contrib/client-side/asvn: only check files, that are part of the subversion repository

2010-05-05 Thread Stefan Sperling
On Wed, May 05, 2010 at 07:03:44PM +0200, Jörg Steffens wrote: > +function stat_details() > +{ > +# attention: stat uses other variables as find, eg. %u<->%U > +local path=${1:-.} > +stat -c "mode=%a user=%U(%u) group=%G(%g)" "$path" This isn't portable, e.g. on OpenBSD you get: stat:

Re: svnserve and sasl cross-realm (was: svnserve and ldap status ?)

2010-05-06 Thread Stefan Sperling
On Tue, May 04, 2010 at 10:38:00AM -0500, Alec Kloss wrote: > I'm happy to help try to set up a configuration that will demonstrate > the issue without patching Cyrus SASL. It'll just require a "real" > Kerberos realm to do it. Is it also possible to use this without any kerberos at all? I'd lik

Re: [PATCH] contrib/client-side/asvn: only check files, that are part of the subversion repository

2010-05-06 Thread Stefan Sperling
On Thu, May 06, 2010 at 12:02:36PM +0200, Jörg Steffens wrote: > IMHO it is a cleaner approach to only work on files that are part of the > svn checkout instead of calling "svn" for all files in the directory > (and filter for errors). But of course, both approaches are doable. > > I replaced "sta

Re: [PATCH] contrib/client-side/asvn: only check files, that are part of the subversion repository

2010-05-06 Thread Stefan Sperling
On Thu, May 06, 2010 at 03:16:38PM +0200, Jörg Steffens wrote: > [[[ > reduces error messages by checking svn return code > > * contrib/client-side/asvn > (recordpermissions): skip files where "svn propget" returns an error. > It is assumed that these files do not belong to the svn reposit

Re: RFC: Issue tracker treatment of patches.

2010-05-07 Thread Stefan Sperling
On Fri, May 07, 2010 at 12:39:05PM -0400, C. Michael Pilato wrote: > I've never been a fan of the PATCH issue type present in our tracker. While > the other issue types (TASK, DEFECT, ENHANCEMENT, FEATURE) tell you > something about the problem that needs a-fixin', PATCH tells you only that > some

Re: java error, core dumped, when building subversion-1.6.11

2010-05-08 Thread Stefan Sperling
On Fri, May 07, 2010 at 10:57:05PM -0700, rupert.thurner wrote: > hi, > > when i try to build subversion-1.6.11 on solaris 9 the below error > occurs. how could one track that down? > /usr/jdk1.6.0_07/bin/javah -force -d subversion/bindings/javahl/ > include -classpath subversion/bindings/javahl/

Re: conflict-storage, and filenames

2010-05-09 Thread Stefan Sperling
On Sat, May 08, 2010 at 11:15:31PM -0400, Greg Stein wrote: > Hey all, > > In wc-1, we record filenames where merge sources are stored, and where > property rejects are written. These are: > > entry->conflict_wrk, ->conflict_old, ->conflict_new, and ->prejfile > > These file names do not appear

Re: conflict-storage, and filenames

2010-05-09 Thread Stefan Sperling
On Sun, May 09, 2010 at 04:54:17PM -0400, Greg Stein wrote: > On Sun, May 9, 2010 at 09:43, Stefan Sperling wrote: > > Well, I've been under the impression that the names are currently > > 100% predictable. Is that not the case? > > Nope. > > $ svn add foo.c

Re: conflict-storage, and filenames

2010-05-10 Thread Stefan Sperling
On Mon, May 10, 2010 at 01:37:36AM -0400, Greg Stein wrote: > On Sun, May 9, 2010 at 18:21, Bert Huijben wrote: > >... > >> From: Stefan Sperling [mailto:s...@elego.de] > >... > >> > As Bert explained, we need to remove them when the user runs "svn >

Re: in-database properties

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 05:03:00AM -0400, Greg Stein wrote: > Hey all, > > After my recent rounds of work, it now appears that we're "ready" to > move to in-database properties. > > If you weren't aware, we record properties into the old-style files > *and* into the database. There is a TEST_DB_P

Re: [PATCH v2] Saving a few cycles, part 3/3

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 01:36:26AM +0200, Johan Corveleyn wrote: > As I understand your set of patches, you're mainly focusing on saving > cpu cycles, and not on avoiding I/O where possible (unless I'm missing > something). Maybe some of the low- or high-level algorithms in the > back-end can be re

Re: [PATCH v2] Saving a few cycles, part 3/3

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 07:43:33AM -0400, Mark Phippard wrote: > On Tue, May 11, 2010 at 7:27 AM, Stefan Sperling wrote: > > On Tue, May 11, 2010 at 01:36:26AM +0200, Johan Corveleyn wrote: > >> As I understand your set of patches, you're mainly focusing on saving >

Re: svn commit: r943445 - in /subversion/trunk/subversion: svn/cl.h svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2010-05-12 Thread Stefan Sperling
On Wed, May 12, 2010 at 10:59:28AM -, s...@apache.org wrote: > Author: stsp > Date: Wed May 12 10:59:27 2010 > New Revision: 943445 > > URL: http://svn.apache.org/viewvc?rev=943445&view=rev > Log: > Add a new --show-diff option to svn log, fixing part of issue #2909. > + SVN_ERR(svn_clie

Re: svn commit: r943445 - in /subversion/trunk/subversion: svn/cl.h svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2010-05-12 Thread Stefan Sperling
On Wed, May 12, 2010 at 07:48:58AM -0400, Mark Phippard wrote: > On Wed, May 12, 2010 at 7:24 AM, Stefan Sperling wrote: > > On Wed, May 12, 2010 at 10:59:28AM -, s...@apache.org wrote: > >> Author: stsp > >> Date: Wed May 12 10:59:27 2010 > >> New

Re: svn commit: r943445 - in /subversion/trunk/subversion: svn/cl.h svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2010-05-12 Thread Stefan Sperling
On Wed, May 12, 2010 at 08:13:55AM -0400, Mark Phippard wrote: > It would also be easy to script and that has always been our position > on adding options like this. Especially if we cannot implement the > option internally more efficiently than the script. Oh, it's not quite the same thing. What

2-URL merges incorrectly reverse-merge mergeinfo for merge target?

2010-05-18 Thread Stefan Sperling
Given the subject line, I guess most of you realised that this mail is intended for Paul and any other merge-tracking nerds on this list :) Attached is a script that shows a merge which removes mergeinfo for the merge target for no explicable reason (at least I can't see a reason for removing it).

Re: 2-URL merges incorrectly reverse-merge mergeinfo for merge target?

2010-05-18 Thread Stefan Sperling
On Tue, May 18, 2010 at 11:57:21PM +0200, Stefan Sperling wrote: > # Reintegrate the feature2 branch > svn up $trunk > svn merge --reintegrate $feature2_url $trunk > svn ci $trunk -m "reintegrate bugfix from feature2 branch" In case that "bugfix" comment confuses

Re: 2-URL merges incorrectly reverse-merge mergeinfo for merge target?

2010-05-19 Thread Stefan Sperling
On Tue, May 18, 2010 at 09:34:37PM -0400, C. Michael Pilato wrote: > Stefan Sperling wrote: > > Given the subject line, I guess most of you realised that this mail > > is intended for Paul and any other merge-tracking nerds on this list :) > > > > Attached is a scri

Re: svn commit: r945708 - in /subversion/branches/1.6.x-issue3469/subversion/libsvn_wc: adm_ops.c entries.c tree_conflicts.c

2010-05-19 Thread Stefan Sperling
On Wed, May 19, 2010 at 12:47:42PM +0200, Johan Corveleyn wrote: > On Tue, May 18, 2010 at 5:42 PM, wrote: > > Author: stsp > > Date: Tue May 18 15:42:57 2010 > > New Revision: 945708 > > > > URL: http://svn.apache.org/viewvc?rev=945708&view=rev > > Log: > > On the 1.6.x-issue3469 branch, fix iss

Re: svn commit: r945708 - in /subversion/branches/1.6.x-issue3469/subversion/libsvn_wc: adm_ops.c entries.c tree_conflicts.c

2010-05-19 Thread Stefan Sperling
On Wed, May 19, 2010 at 03:05:33PM +0200, Stefan Sperling wrote: > On Wed, May 19, 2010 at 12:47:42PM +0200, Johan Corveleyn wrote: > > On Tue, May 18, 2010 at 5:42 PM, wrote: > > > Author: stsp > > > Date: Tue May 18 15:42:57 2010 > > > New Re

Re: svn commit: r946475 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2010-05-19 Thread Stefan Sperling
On Wed, May 19, 2010 at 04:06:05PM -0700, Blair Zajac wrote: > On 05/19/2010 03:58 PM, s...@apache.org wrote: > >Author: stsp > >Date: Wed May 19 22:58:37 2010 > >New Revision: 946475 > > > >URL: http://svn.apache.org/viewvc?rev=946475&view=rev > >Log: > >* tools/dev/unix-build/Makefile.svn: Fix a

Re: svn commit: r946186 - new output parameter SKIP_CHILDREN

2010-05-19 Thread Stefan Sperling
On Thu, May 20, 2010 at 12:14:22AM +0100, Julian Foad wrote: > On Wed, 2010-05-19, s...@apache.org wrote: > > Author: stsp > > Date: Wed May 19 13:55:51 2010 > > New Revision: 946186 > > > > URL: http://svn.apache.org/viewvc?rev=946186&view=rev > > > * subversion/include/svn_wc.h > > (svn_wc_di

<    4   5   6   7   8   9   10   11   >