SVN merge attempting to reintegrate on a merge to a branch

2013-09-13 Thread Goor, Stefan
Hi, We are encountering an issue when trying to merge trunk to a branch. We originally posted this issue to the CollabNet forums (http://subversion.open.collab.net/ds/viewMessage.do?dsForumId=4dsMessageId=499929) but they suggested we should contact this list. We maintain a few branches from

RE: SVN merge attempting to reintegrate on a merge to a branch

2013-09-13 Thread Andrew Reedick
From: Goor, Stefan [mailto:sg...@thetasgroup.com] Sent: Friday, September 13, 2013 11:40 AM To: users@subversion.apache.org Subject: SVN merge attempting to reintegrate on a merge to a branch Recently when we attempted to merge a trunk project to a branch (in preparation of doing a

Re: svn.exe crashed when output of 'log' command interrupted

2013-09-13 Thread Ivan Zhakov
On Fri, Sep 13, 2013 at 3:43 PM, Ivan Zhakov i...@visualsvn.com wrote: On Thu, Sep 12, 2013 at 10:53 AM, Sergey Azarkevich azarkev...@gmail.com wrote: Reproduced on: svn, version 1.8.4-dev (under development) compiled Aug 23 2013, 17:30:38 on x86-microsoft-windows svn, version 1.8.3

Re: SVN merge attempting to reintegrate on a merge to a branch

2013-09-13 Thread Goor, Stefan
Hi Andrew, Thanks for your response. You are right, I hadn't noticed but on the first line about the missing ranges the last letter of the project name is missing and I had just pasted over it when I sanitized the path names. I got around this as you suggested by using the -r 4401:HEAD option

RE: SVN merge attempting to reintegrate on a merge to a branch

2013-09-13 Thread Andrew Reedick
-Original Message- From: Goor, Stefan [mailto:sg...@thetasgroup.com] Sent: Friday, September 13, 2013 3:53 PM To: Andrew Reedick; users@subversion.apache.org Subject: Re: SVN merge attempting to reintegrate on a merge to a branch Hi Andrew, Thanks for your response. You are

Re: svn.exe crashed when output of 'log' command interrupted

2013-09-13 Thread Ivan Zhakov
On Thu, Sep 12, 2013 at 10:53 AM, Sergey Azarkevich azarkev...@gmail.com wrote: Reproduced on: svn, version 1.8.4-dev (under development) compiled Aug 23 2013, 17:30:38 on x86-microsoft-windows svn, version 1.8.3 (r1516576) compiled Aug 27 2013, 22:13:03 on x86-microsoft-windows

Re: corrupted svn repository with “serialized hash missing terminator” error

2013-09-13 Thread Nitin Bhide
Hi Andreas, Thanks. I think such recovery tools should be there. Probably not as part of 'svnadmin' but at least in contrib. The FSFS verify helped me. I will post the script I used to my website. I am not sure if the attachments are allowed in this list. If allowed, I will post here as well. I