Disable diff-cmd

Hello, Is there any way to disable "diff-cmd" setting for just one run of "svn diff"? I need it for code review upload script, which fails when users have configured graphical diff. Is there any way to force svn use internal diff implemantation? I've tried: svn diff --config-option config:helpers:

Re: merging into locally added files

On Mon, Aug 23, 2010 at 06:40:39PM +0100, Julian Foad wrote: > You seem to be talking only about the case where the (locally added) > target is the root of the whole merge, and saying that lack of ancestral > relationship between the source node and this target node doesn't > matter. Maybe the use

Re: Performance branch ready for review

On Tue, Aug 24, 2010 at 12:22 AM, Stefan Fuhrmann wrote: > Daniel Shahaf wrote: >> >> Stefan, you did mention "Patch by" for Johan's patches which you >> committed, did you intend to mention "Found by" or "Suggested by" for >> the other two (quoted below)? >> >> >> http://subversion.apache.org/doc

Re: Performance branch ready for review

Daniel Shahaf wrote: Stefan, you did mention "Patch by" for Johan's patches which you committed, did you intend to mention "Found by" or "Suggested by" for the other two (quoted below)? http://subversion.apache.org/docs/community-guide/conventions.html#crediting Thanks, Daniel Oh, I just w

RE: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

> -Original Message- > From: phi...@apache.org [mailto:phi...@apache.org] > Sent: maandag 23 augustus 2010 13:23 > To: comm...@subversion.apache.org > Subject: svn commit: r988074 - in > /subversion/trunk/subversion/tests/cmdline: svntest/wc.py > upgrade_tests.py > > Author: philip > Dat

Re: Noise: spicy autoindex httpd.conf workaround #fail

Ohohohoh! Now that sounds promising! Will give that a shot. On 08/23/2010 01:50 PM, Justin Erenkrantz wrote: > Why do you want mod_rewrite at all?Enabling that mod_mime > directive will let mod_autoindex remap / to /index.html when it exists > in the virtual filesystem. -- justin > > On Mo

Re: Noise: spicy autoindex httpd.conf workaround #fail

Why do you want mod_rewrite at all?Enabling that mod_mime directive will let mod_autoindex remap / to /index.html when it exists in the virtual filesystem. -- justin On Mon, Aug 23, 2010 at 10:48 AM, C. Michael Pilato wrote: > Hrm.  I'm not seeing the connection here.  I'm looking for a way

Re: Noise: spicy autoindex httpd.conf workaround #fail

Hrm. I'm not seeing the connection here. I'm looking for a way to pull off a Rewrite condition based on the existence of a given URI. The docs imply that this can be done with "RewriteCond SOME_URI -U", but appear to just be wrong -- the existence of SOME_URI doesn't appear to tested at all, onl

Re: merging into locally added files

On Mon, 2010-08-23 at 18:40 +0100, Julian Foad wrote: > On Mon, 2010-08-23 at 18:43 +0200, Stefan Sperling wrote: > > On Wed, Aug 04, 2010 at 12:32:06PM -0400, Paul Burba wrote: > > > On Wed, Aug 4, 2010 at 12:14 PM, Julian Foad > > > wrote: > > > > On Wed, 2010-08-04 at 11:23 -0400, Paul Burba w

Re: merging into locally added files

On Mon, Aug 23, 2010 at 12:35 PM, Stefan Sperling wrote: > One more question: In case a file/directory has been copied, does that > affect its implicit mergeinfo in any way? Definitely, a copy *has* implicit mergeinfo, whereas a local addition has none. Think of it like this: Do a URL-to-WC co

Re: merging into locally added files

On Mon, 2010-08-23 at 18:43 +0200, Stefan Sperling wrote: > On Wed, Aug 04, 2010 at 12:32:06PM -0400, Paul Burba wrote: > > On Wed, Aug 4, 2010 at 12:14 PM, Julian Foad > > wrote: > > > On Wed, 2010-08-04 at 11:23 -0400, Paul Burba wrote: > > >> On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad > >

RE: [RFC] 'External' and 'Switched': common ground

Thanks for this feedback, Bert. Several important points are emerging. The first thing to get straight is what future we want for file externals. File externals should behave like directory externals. The directory externals system is far from a perfect solution to the high-level challenges tha

Re: merging into locally added files

On Wed, Aug 04, 2010 at 12:32:06PM -0400, Paul Burba wrote: > On Wed, Aug 4, 2010 at 12:14 PM, Julian Foad wrote: > > On Wed, 2010-08-04 at 11:23 -0400, Paul Burba wrote: > >> On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad > >> wrote: > >> > if the tree conflict detection policy is "relaxed", and

Re: merging into locally added files

On Wed, Aug 04, 2010 at 11:23:00AM -0400, Paul Burba wrote: > On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad wrote: > > Stefan Sperling wrote: > >> It does not seem possible right now to merge into locally added > >> files, because the Subversion assumes that the merge target will > >> always have a

Re: [RFC/PATCH] Create a fresh svn_repos_parse_fns3_t

Hi Julian, Julian Foad writes: > On Thu, 2010-08-19 at 10:25 +0300, Daniel Shahaf wrote: > > Ramkumar Ramachandra wrote on Thu, Aug 19, 2010 at 11:12:14 +0530: > > > Hi, > > > > > > I sent a patch a while ago for svn_repos_parse_dumpstream3. While I > > > wait for approval, this is an RFC patch d

Re: svn commit: r987956 - /subversion/trunk/build/ac-macros/serf.m4

Justin Erenkrantz wrote on Mon, Aug 23, 2010 at 06:18:14 -0700: > On Mon, Aug 23, 2010 at 4:28 AM, Daniel Shahaf > wrote: > > Does this actually expand SERF_VERSION_STRING?  A quick independent test > > indicates it wouldn't... > > Ah, you're right. Hmm. Any ideas? -- justin Just drop the ma

Re: svn commit: r987956 - /subversion/trunk/build/ac-macros/serf.m4

On Mon, Aug 23, 2010 at 4:28 AM, Daniel Shahaf wrote: > Does this actually expand SERF_VERSION_STRING?  A quick independent test > indicates it wouldn't... Ah, you're right. Hmm. Any ideas? -- justin

Re: [RFC/PATCH] Create a fresh svn_repos_parse_fns3_t

On Thu, 2010-08-19 at 10:25 +0300, Daniel Shahaf wrote: > Ramkumar Ramachandra wrote on Thu, Aug 19, 2010 at 11:12:14 +0530: > > Hi, > > > > I sent a patch a while ago for svn_repos_parse_dumpstream3. While I > > wait for approval, this is an RFC patch describing my future plan once > > that patch

Re: [RFC] 'External' and 'Switched': common ground

On Fri, 2010-08-20 at 20:01 +0200, Stefan Küng wrote: > On 20.08.2010 19:54, Julian Foad wrote: > >* An 'external' or 'switched' WC node is an immediate child of a > > versioned WC directory. [3] > > Don't forget that an external does not necessarily have a versioned WC > dir as its imme

Re: svn commit: r987956 - /subversion/trunk/build/ac-macros/serf.m4

jerenkra...@apache.org wrote on Sun, Aug 22, 2010 at 22:57:26 -: > Author: jerenkrantz > Date: Sun Aug 22 22:57:26 2010 > New Revision: 987956 > > URL: http://svn.apache.org/viewvc?rev=987956&view=rev > Log: > Add a compile-time version check for serf so we can reject old versions. > > * buil

Re: Performance branch - svnserve crash in fs_history_prev

Trying again with .txt extension added. Johan On Mon, Aug 23, 2010 at 11:40 AM, Julian Foad wrote: > On Mon, 2010-08-23, Lieven Govaerts wrote: >> Either you forgot the attachments, or they were dropped by our mailing >> sw. Try adding a .txt extension. > > AFAIK, the mailing list strips attachm

Re: svn commit: r987592 - /subversion/trunk/subversion/libsvn_ra_neon/util.c

On Fri, 2010-08-20, Greg Stein wrote: > On Fri, Aug 20, 2010 at 13:58, wrote: > >... > > +++ subversion/trunk/subversion/libsvn_ra_neon/util.c Fri Aug 20 17:58:10 > > 2010 > >... > > -static ne_xml_parser * > > +/* Create a status parser attached to the request REQ. Detected errors > > + will

Re: Performance branch - svnserve crash in fs_history_prev

On Mon, 2010-08-23, Lieven Govaerts wrote: > Either you forgot the attachments, or they were dropped by our mailing > sw. Try adding a .txt extension. AFAIK, the mailing list strips attachments of MIME type 'application/octet-stream' and a bunch of other types - see

Re: Performance branch - svnserve crash in fs_history_prev

On Mon, Aug 23, 2010 at 11:10 AM, Johan Corveleyn wrote: > Hi, > > I've taken the performance branch for a spin. Some of performance > increases are awesome (svn log is ~4 times faster on my machine > (tested with a file with 300 revisions)). > > However, I also experienced a crash of svnserve, fo

Performance branch - svnserve crash in fs_history_prev

Hi, I've taken the performance branch for a spin. Some of performance increases are awesome (svn log is ~4 times faster on my machine (tested with a file with 300 revisions)). However, I also experienced a crash of svnserve, for both "svn log" and "svn blame" of a big file with >2000 revisions (s

Re: Performance branch ready for review

On Sun, Aug 22, 2010 at 2:56 PM, Stefan Fuhrmann wrote: > Johan Corveleyn wrote: >> >> On Wed, Aug 18, 2010 at 9:14 PM, Stefan Fuhrmann >> wrote: >> >>> >>> Hi @all, >>> >>> I just finished my porting work; the performance branch >>> is now fully synchronized with my prototype code. >>> From my p