Re: file obstruction upon merging an already merged added/moved file (#4649)

2016-09-05 Thread Stefan Hett
On 8/22/2016 5:51 PM, Stefan Hett wrote: Hi, as per stsp's suggestion, sending this to the dev list. I've reduced a problem we've been having with some merge operations on our main repository from time to time down to the repro script attached to this JIRA issue [1] (test_obstruction.bat).

Check SHA vs Content (was: RE: svn commit: r1759233 - /subversion/trunk/subversion/libsvn_wc/questions.c)

2016-09-05 Thread Bert Huijben
> -Original Message- > From: i...@apache.org [mailto:i...@apache.org] > Sent: maandag 5 september 2016 13:33 > To: comm...@subversion.apache.org > Subject: svn commit: r1759233 - > /subversion/trunk/subversion/libsvn_wc/questions.c > > Author: ivan > Date: Mon Sep 5 11:32:54 2016 > New

svn does not react to Ctrl-C when a background process has an unredirected stdout

2016-09-05 Thread Vincent Lefevre
I've finally found a way to reproduce the following old bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=50 (it still occurs with svn 1.9.4). Make SVN_SSH point to the following script: #!/bin/sh sleep 10 & while true; do :; done --

RE: Check SHA vs Content (was: RE: svn commit: r1759233 - /subversion/trunk/subversion/libsvn_wc/questions.c)

2016-09-05 Thread Markus Schaber
Hi, From: Bert Huijben [mailto:b...@qqmail.nl] > From: i...@apache.org [mailto:i...@apache.org] > > Sent: maandag 5 september 2016 13:33 > > To: comm...@subversion.apache.org > > Subject: svn commit: r1759233 - > > /subversion/trunk/subversion/libsvn_wc/questions.c > > > > Author: ivan > > Date: M

Re: Check SHA vs Content (was: RE: svn commit: r1759233 - /subversion/trunk/subversion/libsvn_wc/questions.c)

2016-09-05 Thread Ivan Zhakov
On 5 September 2016 at 14:46, Bert Huijben wrote: >> -Original Message- >> From: i...@apache.org [mailto:i...@apache.org] >> Sent: maandag 5 september 2016 13:33 >> To: comm...@subversion.apache.org >> Subject: svn commit: r1759233 - >> /subversion/trunk/subversion/libsvn_wc/questions.c >>

Re: Check SHA vs Content (was: RE: svn commit: r1759233 - /subversion/trunk/subversion/libsvn_wc/questions.c)

2016-09-05 Thread Stefan Hett
On 9/5/2016 6:23 PM, Ivan Zhakov wrote: With all above the new behavior should be working better or the same in all cases. I agree that 50% approximation may be incorrect for some specific binary formats (case 6) like sqlite db. To be fair, I'd argue that in case of binary file modifications the

Re: file obstruction upon merging an already merged added/moved file (#4649)

2016-09-05 Thread Julian Foad
On 05/09/16 10:55, Stefan Hett wrote: On 8/22/2016 5:51 PM, Stefan Hett wrote: Hi, as per stsp's suggestion, sending this to the dev list. I've reduced a problem we've been having with some merge operations on our main repository from time to time down to the repro script attached to this JI