Hi Julian.
On 11.04.2013 05:10, Julian Foad wrote:
> Hi Matthias. Thanks for your email, and sorry it was so long before I looked
> back in my mailbox and replied.
>
> Matthias Buecher wrote on 2013-02-02:
>
>> the contrib script "detect-merge-conflicts.sh" [1] uses a grep command
>> which al
Hi Matthias. Thanks for your email, and sorry it was so long before I looked
back in my mailbox and replied.
Matthias Buecher wrote on 2013-02-02:
> the contrib script "detect-merge-conflicts.sh" [1] uses a grep command
> which also finds false positive merge conflict markers: it finds single
Alan, thanks for the info.
I have re-tested on NetBSD 5.0, Debian 6.0, Redhat on Sourceforge, FreeBSD 9
and also on OpenWrt/Busybox 1.19.4.
All sed versions support semicolon.
NetBSD needs newlines after closing brackets.
Busybox needs nested brackets for "p" and "q" to work correctly (also makes
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
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
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
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
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
8 matches
Mail list logo
