Re: Cannot merge into mixed-revision working copy

2012-02-24 Thread Daniel Shahaf
Joel Low wrote on Sat, Feb 25, 2012 at 13:17:20 +0800: > Hi Daniel, > > > -Original Message- > > From: Daniel Shahaf [mailto:danie...@elego.de] > > Sent: Saturday, 25 February, 2012 12:38 PM > > To: Joel Low > > Cc: users@subversion.apache.org > > Subject: Re: Cannot merge into mixed-revis

RE: Cannot merge into mixed-revision working copy

2012-02-24 Thread Joel Low
Hi Daniel, > -Original Message- > From: Daniel Shahaf [mailto:danie...@elego.de] > Sent: Saturday, 25 February, 2012 12:38 PM > To: Joel Low > Cc: users@subversion.apache.org > Subject: Re: Cannot merge into mixed-revision working copy > > Daniel Shahaf wrote on Sat, Feb 25, 2012 at 06:08

Re: Cannot merge into mixed-revision working copy

2012-02-24 Thread Daniel Shahaf
Daniel Shahaf wrote on Sat, Feb 25, 2012 at 06:08:17 +0200: > --allow-mixed-revisions, (This is an argument to 'svn merge'.) > but the code shouldn't care about the revision > of the external for the purposes of this check. > > Can you provide a reproduction recipe, starting from an empty > repo

Re: Cannot merge into mixed-revision working copy

2012-02-24 Thread Daniel Shahaf
--allow-mixed-revisions, but the code shouldn't care about the revision of the external for the purposes of this check. Can you provide a reproduction recipe, starting from an empty repository? In a quick test I couldn't trigger the error you describe. http://subversion.apache.org/docs/community

Cannot merge into mixed-revision working copy

2012-02-24 Thread Joel Low
Hello, I'm trying to do a remote-URL/remote-URL merge (for vendor drops) into my working copy which contains externals (for the binaries). When both are updated to HEAD and I try to do the merge, I get this error message. I've tried using --force, but that seems to work once, but subsequently t

Re: Checksum mismatch between 1.4.2 server and 1.7 client

2012-02-24 Thread Daniel Shahaf
Nate Parsons wrote on Fri, Feb 24, 2012 at 14:24:30 -0500: > On Fri, Feb 24, 2012 at 12:46 AM, Daniel Shahaf wrote: > > Nate Parsons wrote on Thu, Feb 23, 2012 at 16:46:55 -0500: > >> * ra_serf : Module for accessing a repository via WebDAV protocol using > >> serf. > >>   - handles 'http' scheme

Re: Checksum mismatch between 1.4.2 server and 1.7 client

2012-02-24 Thread Nate Parsons
On Fri, Feb 24, 2012 at 12:46 AM, Daniel Shahaf wrote: > Nate Parsons wrote on Thu, Feb 23, 2012 at 16:46:55 -0500: >> * ra_serf : Module for accessing a repository via WebDAV protocol using serf. >>   - handles 'http' scheme >>   - handles 'https' scheme >> >> If there is any other information I

Re: Questions about importing data into the Subversion repository on a WINDOWS 2003 Server platform

2012-02-24 Thread Stefan Sperling
On Fri, Feb 24, 2012 at 11:21:54AM -0500, Anastasio, David M CTR USAF AFMC ESC/HNID wrote: > The Subversion documentation references UNIX command line examples (svn > import) but I'm working on a WINDOWS desktop; how do I invoke the > Subversion commands on a WINDOWS platform? If you install Tort

Questions about importing data into the Subversion repository on a WINDOWS 2003 Server platform

2012-02-24 Thread Anastasio, David M CTR USAF AFMC ESC/HNID
Hello, I have installed Apache Subversion on a Windows 2003 Server desktop, along with the TortoiseSVN client. A Project has been created which is empty at the moment, and which contains the three stub subdirectories (branches, tags, trunk). I have configured my vendor software to enable Sour