Re: Help needed: 'History scheduled with commit'

2012-10-09 Thread Daniel Shahaf
That's 1.7, isn't it? Have you tried just committing? If you commit using the cmdline client you'll get a second list of files in the editor window, and even if you don't you can always revert the commit (via reverse merge) or test by committing the merge to a newly-created temporary branch. Dav

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 > time I >

Subversion 1.7.7 released

2012-10-09 Thread Ben Reser
I'm happy to announce the release of Apache Subversion 1.7.7. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download/#recommended-release The SHA1 checksums are: c9fc0c5992eda36ba9affd93a15929e25958a951 subversion-1.7.7.tar.bz2 7380b3e03ca57aa63f45

Re: How to merge a rename of a folder

2012-10-09 Thread Stefan Sperling
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 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 f

Re: How to merge a rename of a folder

2012-10-09 Thread Ryan Schmidt
On Oct 9, 2012, at 10:23, Martin Bischoff wrote: > What is the correct procedure to merge a rename of a folder to a branch? Several years ago, the correct procedure was: don't. I don't know if this has changed since then.

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: how large data will affect performance?

2012-10-09 Thread Cooke, Mark
> -Original Message- > From: Thorsten Schöning [mailto:tschoen...@am-soft.de] > Sent: 09 October 2012 10:17 > To: 'users@subversion.apache.org' > Subject: Re: how large data will affect performance? > > Guten Tag wang.yu, > am Dienstag, 9. Oktober 2012 um 03:35 schrieben Sie: > > > I

Re: how large data will affect performance?

2012-10-09 Thread Thorsten Schöning
Guten Tag wang.yu, am Dienstag, 9. Oktober 2012 um 03:35 schrieben Sie: > I have a SVN server on windows2003. > Now the developer want check in about 10G date to it, and in the > last few months, they will check in about 100G data. > Will so many data affect on server’s performance？ This de

Help needed: 'History scheduled with commit'

2012-10-09 Thread David Aldrich
Hi We have just merged a branch into the trunk (reintegration), but have not committed the merge because some files are marked as 'History scheduled with commit'. We don't know what to do about these. A new folder was added to the branch. That folder is marked 'Added' in the merge, but the f

Re: set depth for external

2012-10-09 Thread Johan Corveleyn
[ Please use reply all to keep the discussion on the list. More below. ] On Tue, Oct 9, 2012 at 8:56 AM, Oto BREZINA wrote: > On 2012-10-07 20:32, Johan Corveleyn wrote: >> >> On Sat, Oct 6, 2012 at 4:45 PM, Oto BREZINA wrote: >>> >>> In one of our Project P we need Module A and Module B we set