Re: svnadmin reports error E160004

2014-03-25 Thread Martin Bischoff
, Philip Martin wrote: > Martin Bischoff writes: > > > I then started "svnadmin verify" on the repository, which reported the > > following error: > > > > * Verified revision 2112. > > * Verified revision 2113. > > svnadmin: E160004: r2114's

svnadmin reports error E160004

2014-03-25 Thread Martin Bischoff
This morning some users reported a problem with our subversion server (update/commit was not possible). Once I restarted the service (Collabnet Subversion svnserve 1.8.5.34819), everything seemed to work again. I then started "svnadmin verify" on the repository, which reported the following error:

Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Martin Bischoff
There is definitely a bug in the display of the data transfer progress. See here for an old discussion on the tortoisesvn-users list: http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2991921 But it seems the root cause is somewhere in SVN. It has to do with issue 3260: h

Re: How to merge a rename of a folder

2012-10-09 Thread Martin Bischoff
Thanks a lot for the detailed information. Please see below for some additional questions. On Tue, Oct 9, 2012 at 7:05 PM, Stefan Sperling wrote: > On Tue, Oct 09, 2012 at 05:23:30PM +0200, Martin Bischoff wrote: > > I have a project which is being developed on /trunk, and at the same

How to merge a rename of a folder

2012-10-09 Thread Martin Bischoff
I have a project which is being developed on /trunk, and at the same time I have a branch (/branches/1.x) for maintenance of version 1.x. Now I'd like to rename a folder of the project, e.g. /trunk/a to /trunk/b. The same folder should also be renamed on the maintenance branch, so that future bugf

Re: Can the mergeinfo of a reintegrate-merge be ignored?

2012-08-02 Thread Martin Bischoff
On Thu, Aug 2, 2012 at 11:20 AM, Ulrich Eckhardt < ulrich.eckha...@dominolaser.com> wrote: > Am 02.08.2012 11:12, schrieb Martin Bischoff: > > When I reintegrate a feature-branch into trunk, this creates a >> svn:mergeinfo property on trunk, e.g. "Merged >> /b

Can the mergeinfo of a reintegrate-merge be ignored?

2012-08-02 Thread Martin Bischoff
When I reintegrate a feature-branch into trunk, this creates a svn:mergeinfo property on trunk, e.g. "Merged /branches/featureBranch:r149-188". What is the purpose of that information? Can (or should) it be ignored when committing trunk after the reintegrate-merge? Since it is recommended to dele

Re: Unexpected files in folder repository\db\...

2011-12-06 Thread Martin Bischoff
On Tue, Dec 6, 2011 at 13:48, Stefan Sperling wrote: > On Tue, Dec 06, 2011 at 01:44:02PM +0100, Martin Bischoff wrote: > > I was not able to get rid of the transaction. 'svnadmin rmtxns' returned > > the following error: > > "svnadmin: E720003: Can'

Re: Unexpected files in folder repository\db\...

2011-12-06 Thread Martin Bischoff
On Mon, Dec 5, 2011 at 23:17, Daniel Shahaf wrote: > Ryan Schmidt wrote on Mon, Dec 05, 2011 at 14:33:18 -0600: > > On Dec 5, 2011, at 08:32, Martin Bischoff wrote: > > > > > -> is it expected that such transaction and locks files and folders > remain in the db f

Unexpected files in folder repository\db\...

2011-12-05 Thread Martin Bischoff
While backing up our repository and preparing to update to subversion 1.7.x I found some files inside the folder "c:\svn_repository\{repository_name}\db" which made me wonder whether we have a problem with our repository: - In "db\transactions" I see a folder named "9279-7lb.txn" containing vari