Re: [bug] detect-merge-conflicts.sh reports false positive merge conflict markers

2013-02-20 Thread Alan Barrett
On Wed, 20 Feb 2013, Matthias Buecher / Germany wrote: I tested on Debian 6.0 Squeeze and on Sourceforge Redhat server. Just installed FreeBSD 9.0 in a VM and sed on FreeBSD needs a semicolon to separate last command and closing bracket. Semicolon might often work, but the portable syntax requ

RE: Problem with Fedora 18

2013-02-20 Thread Gavin Baumanis
Just while you wait for a more considered response... Have you tried performing a; svn cleanup of your local working copy and then the upgrade? Gavin From: Celso Tadao Suzuki [mailto:celso.suz...@digitro.com.br] Sent: Wednesday, 20 February 2013 12:32 To: dev@subversion.apache.org Subject: P

Interactive conflict resolver issues

2013-02-20 Thread Julian Foad
Some things that need doing for interactive conflict resolution: * conflict_status_walker() calls the resolver callback and then ignores the result->merged_file part of the result.  That means certain confict resolutions will appear to succeed while silently choosing the wrong version of the te

Re: [PATCH] swig-py: Adding tests for svn_checksum_dup() and svn_checksum_match()

2013-02-20 Thread Shivani Poddar
On Wed, Feb 20, 2013 at 11:41 PM, Ben Reser wrote: > On Tue, Feb 19, 2013 at 10:01 PM, Shivani Poddar > wrote: > > > > [ [ [ > > > > Improving support for svn_checksum.h in SWIG bindings. > > Same comment as last time about the description line. > > > * subversion/bindings/swig/python/tests/chec

Re: [bug] detect-merge-conflicts.sh reports false positive merge conflict markers

2013-02-20 Thread Matthias Buecher / Germany
I tested on Debian 6.0 Squeeze and on Sourceforge Redhat server. Just installed FreeBSD 9.0 in a VM and sed on FreeBSD needs a semicolon to separate last command and closing bracket. The used sed functions are just the most basic sed and regexe functions. Corrected line: SUSPICIOUS=$($SVNLOOK dif

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Daniel Shahaf
Gabriela Gibson wrote on Wed, Feb 20, 2013 at 21:03:58 +: > On 20/02/13 18:54, Daniel Shahaf wrote: >> Gabriela Gibson wrote on Wed, Feb 20, 2013 at 16:22:36 +: >>> +Putting it all together, an example VirtualHost configuration is: >>> + >>> + >>> +ServerAdmin we

Re: [RFC] Build System Documentation

2013-02-20 Thread Ben Reser
On Mon, Feb 18, 2013 at 4:10 AM, Gabriela Gibson wrote: > I've written up some documentation about the build system, could I > please have some feedback as to usefulness, style, shape etc? Seems plenty useful for someone that isn't familiar with our build system. The major comment I have is you'

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Gabriela Gibson
On 20/02/13 18:54, Daniel Shahaf wrote: Gabriela Gibson wrote on Wed, Feb 20, 2013 at 16:22:36 +: On 20/02/13 15:28, Gabriela Gibson wrote: +++ publish/.htaccess (working copy) @@ -1,7 +1,6 @@ # duplicated in httpd.conf in r795618 Options +Includes -XBitHack On RedirectMatch ^/build

Re: [bug] detect-merge-conflicts.sh reports false positive merge conflict markers

2013-02-20 Thread Alan Barrett
On Wed, 20 Feb 2013, Daniel Shahaf wrote: They seem to be invalid on BSD sed: % printf 'foo\nbar\nbaz\n' | sed -ne '/foo/,/baz/ { /bar/p }' sed: 1: "/foo/,/baz/ { /bar/p } ": extra characters at the end of p command The close brace must be on a new line. This works on NetBSD: $ printf 'foo\nb

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Daniel Shahaf
Daniel Shahaf wrote on Wed, Feb 20, 2013 at 20:54:31 +0200: > Gabriela Gibson wrote on Wed, Feb 20, 2013 at 16:22:36 +: > > +++ publish/.htaccess (working copy) > > @@ -1,7 +1,6 @@ > > # duplicated in httpd.conf in r795618 > > Options +Includes > > > > -XBitHack On > > RedirectMatch

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Daniel Shahaf
Gabriela Gibson wrote on Wed, Feb 20, 2013 at 16:22:36 +: > On 20/02/13 15:28, Gabriela Gibson wrote: >> On 20/02/13 07:24, Daniel Shahaf wrote: >>> >> >> Thank you :) >> >> The patch and log are attached. > Sorry, I'm just hooked on phonics at the moment (and the virus I'm still > wrestling

Problem with Fedora 18

2013-02-20 Thread Celso Tadao Suzuki
Hi, I was using Fedora 15 an I upgrade my box to Fedora 18. The SVN server is 1.6.6 version The SVN client is 1.7.8 version Now, when i try a command like info I got the message : * [celso@sfw06 tcf]$ svn info** **svn: E155036: Please see the 'svn upgrade' command** **svn: E155036: Working copy

Re: [PATCH] swig-py: Adding tests for svn_checksum_dup() and svn_checksum_match()

2013-02-20 Thread Ben Reser
On Tue, Feb 19, 2013 at 10:01 PM, Shivani Poddar wrote: > > [ [ [ > > Improving support for svn_checksum.h in SWIG bindings. Same comment as last time about the description line. > * subversion/bindings/swig/python/tests/checksum.py: "swig-py: Adding tests > for > > svn_checksum_dup() and svn_ch

Merge scenarios where SVN fails

2013-02-20 Thread Ben Reser
There's a question looking for scenarios where SVN fails and git succeeds: http://stackoverflow.com/q/14889395/2089194 We often have a hard time getting user information about things that they find that aren't working well for them, since many users just work around the issue and never say anythin

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Gabriela Gibson
On 20/02/13 15:28, Gabriela Gibson wrote: On 20/02/13 07:24, Daniel Shahaf wrote: Thank you :) The patch and log are attached. Sorry, I'm just hooked on phonics at the moment (and the virus I'm still wrestling is probably innocent), a correction is attached. I added the log file again and

Re: [PATCH] Procedure for making web page changes

2013-02-20 Thread Gabriela Gibson
On 20/02/13 07:24, Daniel Shahaf wrote: Thank you :) The patch and log are attached. [[[ Addition of section to Community Guide describing procedure for obtaining the source for the Subversion web site. Addition of navigation links to new page within community guide. Add three html files

Re: compiler warnings buildbot

2013-02-20 Thread Daniel Shahaf
I've asked infra to make it happen: https://issues.apache.org/jira/browse/INFRA-5884 Daniel Shahaf wrote on Fri, Feb 15, 2013 at 01:29:10 +0200: > I have a build configuration that currently does > autogen+configure+'make' and has no errors or warnings at all. > I suggest we make a buildbot out of

Re: [bug] detect-merge-conflicts.sh reports false positive merge conflict markers

2013-02-20 Thread Daniel Shahaf
Thanks Gavin. Matthias: how portable are the sed constructs you used? They seem to be invalid on BSD sed: % printf 'foo\nbar\nbaz\n' | sed -ne '/foo/,/baz/ { /bar/p }' sed: 1: "/foo/,/baz/ { /bar/p } ": extra characters at the end of p command I don't mind improving the detection but I'd like to

RE: [bug] detect-merge-conflicts.sh reports false positive merge conflict markers

2013-02-20 Thread Gavin Baumanis
Ping. This Patch submission has received no comments. > -Original Message- > From: Matthias Buecher / Germany [mailto:m...@maddes.net] > Sent: Saturday, 2 February 2013 15:20 > To: dev@subversion.apache.org > Subject: [bug] detect-merge-conflicts.sh reports false positive merge conflict

Re: WebDAV proxy feature "negotiation" -- there's *got* to be a better way.

2013-02-20 Thread Daniel Shahaf
Daniel Shahaf wrote on Tue, Feb 19, 2013 at 14:09:39 +: > Reviving an old thread: has anyone evaluated the possibility of having the > slave ask the master for its version at runtime? I've filed http://subversion.tigris.org/issues/show_bug.cgi?id=4324 with milestone 1.8-consider to track this