Re: Issue with merge

2011-06-16 Thread Henry Piñeros
This is my case!!! 1. I do a copyTo() from my trunk to a branch (branchPrueba). 2. I do a checkout from branchPrueba (C:/Prueba), I modify a file (Hola1.java) and after I do commite it. 3. I do a checkout from trunk (C:/Trunk), I modify a file (Hola1.java) and after I do commite it. 4. Run cm

Re: Problem Loading Huge Repository

2011-06-16 Thread Geoff Hoffman
Um... separate revision range at a time... -r 6000:HEAD ? only individual directories at a time... path/to/dir -r 6000:HEAD ? Or... This is a bit out there but you could spin up and install subversion on a 4XL amazon EC2 instance, import it on this very, very fast (virtual) machine, then the m

Re: Problem Loading Huge Repository

2011-06-16 Thread Bruno Antunes
On Jun 17, 2011, at 24:59 , Geoff Hoffman wrote: > > > On Thu, Jun 16, 2011 at 4:05 PM, Bruno Antunes wrote: > Hi, > > As part of the work of my PhD thesis I need to load the ASF Subversion > repository into my own local repository in order to mine and extract > information from the reposit

Re: Problem Loading Huge Repository

2011-06-16 Thread Geoff Hoffman
On Thu, Jun 16, 2011 at 4:05 PM, Bruno Antunes wrote: > Hi, > > As part of the work of my PhD thesis I need to load the ASF Subversion > repository into my own local repository in order to mine and extract > information from the repository without overloading the ASF servers. > > I have downloade

issue #3264

2011-06-16 Thread Lakhinder Walia
I have some information on this issue. http://subversion.tigris.org/issues/show_bug.cgi?id=3264 (Hoping we could get a fix for this. The workaround is not really okay for automatic scripts). Running svn client either from cli (cygwin) (or from gui: tortioise-svn) from relatively slow VMs. A

Problem Loading Huge Repository

2011-06-16 Thread Bruno Antunes
Hi, As part of the work of my PhD thesis I need to load the ASF Subversion repository into my own local repository in order to mine and extract information from the repository without overloading the ASF servers. I have downloaded the repository dump and started loading it into my own reposito

Re: Using SVN to develop a website

2011-06-16 Thread Michael Diers
On 2011-06-13 16:13, Andy Levy wrote: [...] > Be advised that there are security fixes included in later 1.5.x > releases in addition to the usual bug fixes, and when Subversion 1.7 > is released (the first alpha came out a few days ago) support for > 1.5.x will end. Debian have a policy to backpo

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Wolfgang Röckelein
Hi Stefan, Stefan Sperling wrote: > On Thu, Jun 16, 2011 at 12:21:01PM +0200, Stefan Sperling wrote: >> Thanks for your help! It's great that you can test this. > > I forgot to mention: Please read the 1.7 release notes, > especially the section regarding the change of the working copy > format:

Re: Issue with merge

2011-06-16 Thread Michael Diers
On 2011-06-16 22:37, Henry Piñeros wrote: > Can you try it in your computer ? A simple example!!! ( a flder with > two files) [...] Henry, please tell us _exactly_ what you did; that is, the sequence of Subversion commands, and their output, if any. Cut and paste from the command line window. Th

Re: Issue with merge

2011-06-16 Thread Henry Piñeros
Can you try it in your computer ? A simple example!!! ( a flder with two files) On Thu, Jun 16, 2011 at 3:36 PM, Henry Piñeros wrote: > Thanks Stefan!!. > > > Yes, I do svn revert -R or do a new checkout!!! > > The problem is whenI try do a mergen on file level, but if I do it on > folder lever

Re: Issue with merge

2011-06-16 Thread Henry Piñeros
Thanks Stefan!!. Yes, I do svn revert -R or do a new checkout!!! The problem is whenI try do a mergen on file level, but if I do it on folder lever(parent folder of that file), It works :( On Thu, Jun 16, 2011 at 3:10 PM, Stefan Sperling wrote: > On Thu, Jun 16, 2011 at 02:27:52PM -050

Re: Issue with merge

2011-06-16 Thread Stefan Sperling
On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piñeros wrote: > Hi all. > > > I do a merge between two folders (source) (Ep. svn merge > http:xxx/src http:xxx/src) and it works very well (It shows a File1.java > with a conflcit -C) > > Whe and I try do it but directly in this file, the merges

Issue with merge

2011-06-16 Thread Henry Piñeros
Hi all. I do a merge between two folders (source) (Ep. svn merge http:xxx/src http:xxx/src) and it works very well (It shows a File1.java with a conflcit -C) Whe and I try do it but directly in this file, the merges doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java )..

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

2011-06-16 Thread Geoff Hoffman
On Thu, Jun 16, 2011 at 11:07 AM, B Smith-Mannschott wrote: > On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman > wrote: > > > > > > On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber < > m.scha...@3s-software.com> > > wrote: > >> > >> Hi, Geoff, > >> > >> Von: Geoff Hoffman [mailto:ghoff...@cardinalpat

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

2011-06-16 Thread B Smith-Mannschott
On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman wrote: > > > On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber > wrote: >> >> Hi, Geoff, >> >> Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] >> >>> I have a file with some (I believe) Portuguese characters in the >> >>> filename that someone man

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

2011-06-16 Thread Geoff Hoffman
On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber wrote: > Hi, Geoff, > > Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] > >>> I have a file with some (I believe) Portuguese characters in the > >>> filename that someone managed to store in the repo without any problem, > >>> and I checked it

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Stefan Sperling
On Thu, Jun 16, 2011 at 12:21:01PM +0200, Stefan Sperling wrote: > Thanks for your help! It's great that you can test this. I forgot to mention: Please read the 1.7 release notes, especially the section regarding the change of the working copy format: http://subversion.apache.org/docs/release-note

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Stefan Sperling
On Thu, Jun 16, 2011 at 11:58:31AM +0200, Wolfgang Röckelein wrote: > Stefan Sperling wrote: > > It's very likely that this problem has been fixed in 1.7. > > Are you able to test your steps with the 1.7.0-alpha1 release to > > verify that it has been fixed? Thanks in advance! > > Would I have to

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Wolfgang Röckelein
Stefan Sperling wrote: > On Wed, Jun 15, 2011 at 10:05:16AM +0200, Wolfgang Röckelein wrote: >> I have two problems when creating a tag from a mixed rev working copy. Both >> problems are caused by a rename (copy+delete) from the past inside. >> >> One case is a directory, here I get the following

Re: Backing Data

2011-06-16 Thread Ulrich Eckhardt
On Wednesday 15 June 2011, Konstantin Kolinko wrote: > 2011/6/15 Herbie Marais : > > Our employees often work remotely and the source control system needs to > > be able to recover is the connection is interrupted while the user is > > busy checking in a file. > > 2. It works fine. The files are t

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Stefan Sperling
On Wed, Jun 15, 2011 at 10:05:16AM +0200, Wolfgang Röckelein wrote: > Hi, > > I have two problems when creating a tag from a mixed rev working copy. Both > problems are caused by a rename (copy+delete) from the past inside. > > One case is a directory, here I get the following error, is the

Re: Problem with mod_dav_svn and svn_repos__post_commit_error_str

2011-06-16 Thread Chris Wolstenholme
Thanks. That was the problem. A version of svn installed with the os. Removing the older version fixed it. Thanks for your help. Chris On 16/06/2011 00:11, Daniel Shahaf wrote: Do you have a pre-1.6.17 libsvn_repos on the system? (That symbol is defined by libsvn_repos, and I suspect it's on

Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside

2011-06-16 Thread Daniel Shahaf
Wolfgang Röckelein wrote on Thu, Jun 16, 2011 at 08:45:18 +0200: > Daniel Shahaf wrote: > > Wolfgang Röckelein wrote on Wed, Jun 15, 2011 at 10:05:16 +0200: > >> I have two problems when creating a tag from a mixed rev working copy. Both > >> problems are caused by a rename (copy+delete) from the p