Re: Cannot reintegrate feature branch

2010-05-11 Thread Jean Seurin
Stefan Sperling wrote: On Tue, May 11, 2010 at 12:06:50PM +0800, Jean Seurin wrote: Hi Stefan first of all thanks for spending the time for this long thorough analysis. 1) I want to state that we're using a range of different SVN clients, cli, Intellij Eclipse, mainly, and some people unde

RE: long path names on windows prefixed with \\?\ not handled by svn commands

2010-05-11 Thread Bert Huijben
Subversion uses the APR library which handles the escaping for specific API functions that allow this trick. The '\\?\' style paths are not a different path, but just the original path escaped for a specific api. (Some Windows APIs allow this trick, others just support long paths directly and the

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Peter Kahn
Thanks, I am not entirely sure what people were using for their push / pull but I'm pushing a standard now. I think we hit the following problems that made things worse: - cherry pick merges + merges at levels below root (all are allowed, but they can make later merges more complex) - we assumed m

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Peter Kahn
Thanks I have read that doc, but it was a while back so I'll re read it. The issue with the problems we are seeing is that I'm coming in late to this situation so most o of these I haven't seen first hand. I also discovered that people weren't using --reintegrate and push from branch to trunk. T

Re: Subversion Exception will attempting to modify ignore list

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 02:05:47PM -0400, Miller, David D wrote: > I use TortoiseSVN to access Subversion. I'm reporting this here because the > popup said to do so. > > I attempted to add some files to the ignore list. When I tried to commit the > changes, Subversion said I had a tree conflic

Subversion Exception will attempting to modify ignore list

2010-05-11 Thread Miller, David D
I use TortoiseSVN to access Subversion. I'm reporting this here because the popup said to do so. I attempted to add some files to the ignore list. When I tried to commit the changes, Subversion said I had a tree conflict, but nothing I could do allowed me to resolve the conflict. So I attemp

Free Online Subversion Training - All About Hook Scripts

2010-05-11 Thread George Powell
Hi all. WANdisco is offering some free online training sessions over the next few weeks, for any that are interested. The topics will include: * Introduction to Subversion for Developers - 5th May * All About Subversion Hook Scripts - 19th May * Using Subversion Locking - 2nd June * All Abo

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Philip Martin
Stefan Sperling writes: > Blindly marking all delete vs. delete conflicts resolved is wrong > (unless you don't care about rename conflicts). As I said, it's debatable. One could decide that since renames don't exist they really are just copies and deletes. In that case the deletes don't confl

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 03:53:20PM +0100, Philip Martin wrote: > (4) This is deliberate Subversion policy as Subversion cannot > distinguish between simple deletes and deletes that are part of a > move. It's debatable whether this behaviour is correct, but it is > deliberate. This is a problem wi

Re: Best practice for moving folders around?

2010-05-11 Thread Ulrich Eckhardt
On Tuesday 11 May 2010, Cooke, Mark wrote: > Can I ask your suggestions on how best to correct the following > scenario: > > In a new repository we checked a version of the product code into > 'trunk' (moving projects from VSS, finally). Just for the record: There are tools that preserve some hist

Re: Subversion with mod_dav_svn (WebDAV) and large (binary) files

2010-05-11 Thread Andy Levy
Please don't post HTML-formatted messages. On Tue, May 11, 2010 at 10:47, Marcus Scheller wrote: > is a subversion-server with ‘mod_dav_svn module’ (http/https)   able to > handle large  (binary) files (> 2GB)? > > Are there any server/ os limitations? > > Are there client-limitations using a we

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Philip Martin
Peter Kahn writes: > *Problems we are seeing:* > >1. changes not reported during trunk-to-branch merge show up in >subsequent branch-to-trunk >2. conflicts on svn:mergefinfo properties during merge >3. file missing, but local edit on new file added in branch and pushed to >tru

Best practice for moving folders around?

2010-05-11 Thread Cooke, Mark
Dear List, Can I ask your suggestions on how best to correct the following scenario: In a new repository we checked a version of the product code into 'trunk' (moving projects from VSS, finally). This was cp'd to 'tags'/tag1. A new svn user then cp'd 'tags'/tag1 to 'tags'/tag2 and checked this

Subversion with mod_dav_svn (WebDAV) and large (binary) files

2010-05-11 Thread Marcus Scheller
Dear SVN-Team, is a subversion-server with 'mod_dav_svn module' (http/https) able to handle large (binary) files (> 2GB)? Are there any server/ os limitations? Are there client-limitations using a web-client for checkin/checkout large files (>2GB) I've heard that these browser has limits:

Re: mimimal backup of working copies?

2010-05-11 Thread Les Mikesell
Tino Schwarze wrote: On Wed, May 05, 2010 at 11:38:51AM -0500, Les Mikesell wrote: Does anyone know of a way to backup/move/copy checked out working copies such that you can skip all the parts that 'svn update' would reconstruct? I'm about to copy the home directories of a machine used mos

AW: Question regarding: * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)

2010-05-11 Thread Graf, Andreas
Thank you Stefan! This was really fast... Best regards, Andreas Graf -Ursprüngliche Nachricht- Von: Stefan Sperling [mailto:s...@elego.de] Gesendet: Dienstag, 11. Mai 2010 14:01 An: Graf, Andreas Cc: users@subversion.apache.org; Bruedern, Ivonne Betreff: Re: Question regarding: * mergein

long path names on windows prefixed with \\?\ not handled by svn commands

2010-05-11 Thread Heinz Prantner
Hello, running svn client commands other than svn checkout on windows fail, if the path name (of the local working copy location) is prefixed with \\?\. The prefix is required for path names longer than 255 or so. It seems that svn commands like svn info or svn status behave different than s

Re: Question regarding: * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 01:29:47PM +0200, Graf, Andreas wrote: > Hi SVN folks! > > According the bug-database the issue #3573 is only patching the static > function 'diff_mergeinfo_props' at props.c (and a python test script). > > For me it seems that there is no need to update our server 1.6.6 t

Question regarding: * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)

2010-05-11 Thread Graf, Andreas
Hi SVN folks! According the bug-database the issue #3573 is only patching the static function 'diff_mergeinfo_props' at props.c (and a python test script). For me it seems that there is no need to update our server 1.6.6 to 1.6.11 because only the external functions 'svn_wc__merge_props' an

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Stefan Sperling
On Mon, May 10, 2010 at 12:12:49PM -0400, Peter Kahn wrote: > People use the this merge pattern > > a) PULL - merge trunk-to-branch, resolve, test, commit > > b) PUSH - merge branch-to-trunk, resolve, test, commit > > c) Recreate branch (or usually create new story branch and drop old since > it

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Julian Foad
Hi Peter. The mergeinfo "corruption" may be real, but just as likely it doesn't work the way you expect, or Subversion is being asked to perform combinations of merging that it doesn't support automatically. It seems likely that even if there is some "corrupt" merge info, that is only a part of t

Re: Cannot reintegrate feature branch

2010-05-11 Thread Stefan Sperling
On Tue, May 11, 2010 at 12:06:50PM +0800, Jean Seurin wrote: > Hi Stefan > > first of all thanks for spending the time for this long thorough analysis. > > 1) I want to state that we're using a range of different SVN > clients, cli, Intellij Eclipse, mainly, and some people under > Windows may us

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

2010-05-11 Thread Stein Somers
I suspect I have corrupt mergeinffo but I'm not sure. Does anyone know how I'd make a determination and what resources are out there to help fix problems? I'd make the determination by reading and understanding the mergeinfo values. They are plain text after all. The resource to read is http:

Re: Performance Tips?

2010-05-11 Thread Tino Schwarze
Hi Brendan, On Wed, May 05, 2010 at 09:46:10AM -0400, Brendan Farr-Gaynor wrote: > Thanks for your response! Running local copies of the environment > doesn't seem practical in this case, my guys are working on 10+ > projects at a time all of which can be in different states and which > need many

Re: Performance Tips?

2010-05-11 Thread Tino Schwarze
Hi Brendan, On Wed, May 05, 2010 at 09:21:43AM -0400, Brendan Farr-Gaynor wrote: > I run a small team of web developers (6) who all work from an in-house > repository. We make lots of commits and often and notice the > performance gets pretty bad. Sometimes taking as long as 2 minutes to > commit

Re: mimimal backup of working copies?

2010-05-11 Thread Tino Schwarze
On Wed, May 05, 2010 at 11:38:51AM -0500, Les Mikesell wrote: > Does anyone know of a way to backup/move/copy checked out working copies > such that you can skip all the parts that 'svn update' would > reconstruct? I'm about to copy the home directories of a machine used > mostly for checkou

Re: commit failed - No such file or directory

2010-05-11 Thread Vikrama Sanjeeva
Hi, Subversion 1.6.9 hosted on Solaris 5.10 and am using TortoiseSVN 1.6.7 on WinXP Pro SP2 permissions on "/my/svn/backup/repo-7" is "chmod -R 777" [so it should be accessible by apache and all] /my/svn/repo> ls README.txt confdav db format hooks locks /my/svn/b

RE: commit failed - No such file or directory

2010-05-11 Thread Cooke, Mark
> On Mon, May 10, 2010 at 3:42 PM, Vikrama Sanjeeva > wrote: > > Hi, > > 1: Did backup of live repository as below: > hot-backup.py --archive-type=zip /my/svn/repo /my/svn/backup > > 2: Unzipped /my/svn/backup/repo-7.zip > > 3: checkout /my/svn/

Re: commit failed - No such file or directory

2010-05-11 Thread Vikrama Sanjeeva
Hi All, Someone please help me to troubleshoot this issue. Thanks. Bye, Viki. On Mon, May 10, 2010 at 3:42 PM, Vikrama Sanjeeva wrote: > Hi, > > 1: Did backup of live repository as below: > hot-backup.py --archive-type=zip /my/svn/repo /my/svn/backup > > 2: Unzipped /my/svn/backup/repo-7.zip