[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Issue with merging files containing spaces

From: Blake Mitchell <bmitchell_at_marketmetrix.com>
Date: Thu, 05 Feb 2009 14:40:18 -0800

Purple Streak wrote:
> This went into 1.5.4 I think. I'm sure remember testing it before we
> deployed it using the script and it worked ok.
>
I ran through this again just to make sure, looks like exactly the same
bug to me, possibly a regression? This output is from a windows CMD
window, so the line wrapping is a little funny.

C:\Documents and Settings\bmitchell\svn\bmitchell\test>svn --version
svn, version 1.5.5 (r34862)
   compiled Dec 23 2008, 12:42:22

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet
(http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using
Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme

C:\Documents and Settings\bmitchell\svn\bmitchell\test>svn info
Path: .
URL: http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/test
Repository Root: http://subversion.marketmetrix.com/svn/CM
Repository UUID: 41c89251-5409-b74b-bda2-d7b59c07fd4b
Revision: 16608
Node Kind: directory
Schedule: normal
Last Changed Author: MARKETMETRIX\bmitchell
Last Changed Rev: 16608
Last Changed Date: 2009-02-05 14:26:47 -0800 (Thu, 05 Feb 2009)

C:\Documents and Settings\bmitchell\svn\bmitchell\test>svn mkdir "test
space"
A test space

C:\Documents and Settings\bmitchell\svn\bmitchell\test>svn commit -m test
Adding test\test space

Committed revision 16610.

C:\Documents and Settings\bmitchell\svn\bmitchell\test>cd "test space"

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
mkdir b1
A b1

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>echo
123 > b1\
test.txt

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
add b1\tes
t.txt
A b1\test.txt

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
commit -m
test
Adding test space\b1
Adding test space\b1\test.txt
Transmitting file data .
Committed revision 16611.

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
copy b1 b2

A b2

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>echo
ABC >> b2
\test.txt

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
commit -m
test
Adding test space\b2
Sending test space\b2\test.txt
Transmitting file data .
Committed revision 16612.

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
merge --re
integrate
"http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/test/
test space/b2" b1
svn: URL
'http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/test/t
est space/b2' is malformed or the scheme or host or path is missing

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>svn
merge --re
integrate
"http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/test/
test%20space/b2" b1
svn: URL
'http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/test/t
est space/b2' is malformed or the scheme or host or path is missing

C:\Documents and Settings\bmitchell\svn\bmitchell\test\test space>

Just to confirm the server version:

bmitchell_at_ops-athena:~$ HEAD
http://subversion.marketmetrix.com/svn/CM/branch/User/bmitchell/
Enter username for Subversion repositories at
subversion.marketmetrix.com:80: bmitchell
Password:
200 OK
Connection: close
Date: Thu, 05 Feb 2009 22:03:11 GMT
Accept-Ranges: bytes
ETag: W/"16594//branch/User/bmitchell"
Server: Apache/2.2.8 (Win32) mod_ssl/2.2.8 OpenSSL/0.9.8g DAV/2
SVN/1.5.5 mod_auth_sspi/1.0.4
Content-Type: text/html; charset=UTF-8
Last-Modified: Thu, 05 Feb 2009 21:53:37 GMT
Client-Date: Thu, 05 Feb 2009 22:05:59 GMT
Client-Peer: 192.168.1.1:80
Client-Response-Num: 1

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1109402
Received on 2009-02-06 11:15:02 CET

This is an archived mail posted to the Subversion Dev mailing list.