Re: Using subversion (or something else?)
Les Mikesell wrote:
> On 5/21/2010 8:52 AM, Gary . wrote:
>> Accessing the jg project is fine:
>> j...@work ~/work/svntest
>> $ svn list file:///mnt/h/svn/jg
>> .bashrc
[...]
> Which has nothing to do with the location you tried to use in the
> failing import.
No. I just wanted to show that the basic paths existed (/mnt/h/svn)
because of the "Unable to open repository" message below.
>> when trying to copy the "vendor data":
>> j...@work ~/work/svntest
>> $ svn copy file:///mnt/h/svn/GDJ/foobar/0.1 \
>> file:///mnt/h/svn/myproject/trunk/foobar \
>> -m "bring foobar-0.1 into driver project"
>> svn: Unable to open an ra_local session to URL
>> svn: Unable to open repository 'file:///mnt/h/svn'
>>
>> Huh? "Unable to open repository 'file:///mnt/h/svn'"? To which
>> URL is it even referring?
>
> You can only svn copy with url's pointing to within the same
> repository. Or you can do it locally in a checked out working copy and
> commit it back.
Ah okay. Thanks. Will try again next week when I am back at
work. Perhaps the redbook is misleading here then, because going purely
by the text in the commands shown in the example it looks like two
different repositories are involved:
,
| $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \
|http://svn.example.com/repos/calc/libcomplex\
^^
|-m "bringing libcomplex-1.0 into the main branch"
`
> And is that file:///mnt/h/svn/GDJ/foobar/0.1 supposed
> to refer to a revision or is that a subdirectory you imported there?
I did my local equivalent of
,
| $ svn copy http://svn.example.com/repos/vendor/libcomplex/current \
|http://svn.example.com/repos/vendor/libcomplex/1.0 \
|-m "tagging libcomplex-1.0"
`
before that ('The tagging of the "vendor data" went okay' in my last
post).
--
Gary
Re: Using subversion (or something else?)
On May 22, 2010, at 06:24, Gary wrote: > Les Mikesell wrote: >> > >> You can only svn copy with url's pointing to within the same >> repository. Or you can do it locally in a checked out working copy and >> commit it back. > > Ah okay. Thanks. Will try again next week when I am back at > work. Perhaps the redbook is misleading here then, because going purely > by the text in the commands shown in the example it looks like two > different repositories are involved: > , > | $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \ > > |http://svn.example.com/repos/calc/libcomplex\ >^^ > |-m "bringing libcomplex-1.0 into the main branch" > ` The Subversion project generally uses term "repos" to abbreviate the word "repository", *not* the word "repositories" as I also originally thought. I personally tend to use the term "repo" to abbreviate the term "repository" since I find this much clearer.
Re: Using subversion (or something else?)
Ryan Schmidt wrote: > On May 22, 2010, at 06:24, Gary wrote: >> , >> | $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \ >> >> |http://svn.example.com/repos/calc/libcomplex\ >>^^ >> |-m "bringing libcomplex-1.0 into the main branch" >> ` > > The Subversion project generally uses term "repos" to abbreviate the > word "repository", *not* the word "repositories" Oh my good grief. Thanks, Ryan! -- Gary
svn "XML data was not well-formed"
Hi, I'm trying to check out the code of songbird with svn co http://publicsvn.songbirdnest.com/client/trunk songbird It always fail with "les données XML sont mal formatées". This happens wherever my workspace is. If I run the same command with another local account, it works. So I supposed one of my config file is broken but when I activated neon debug, it turns out the server gives different responses to the same request! Any idea how I can fix this? Thanks! Régis [working] ... Sending request-line and headers: Sending request body: Body block (300 bytes): [] Request sent; retry is 1. [status-line] < HTTP/1.1 207 Multi-Status [hdr] Date: Sat, 22 May 2010 09:56:52 GMT Header Name: [date], Value: [Sat, 22 May 2010 09:56:52 GMT] [hdr] Server: Apache/2.2.8 (Ubuntu) DAV/2 SVN/1.4.6 mod_python/3.3.1 Python/2.5.2 Header Name: [server], Value: [Apache/2.2.8 (Ubuntu) DAV/2 SVN/1.4.6 mod_python/3.3.1 Python/2.5.2] [hdr] Content-Length: 682 Header Name: [content-length], Value: [682] [hdr] Content-Type: text/xml; charset="utf-8" Header Name: [content-type], Value: [text/xml; charset="utf-8"] [hdr] End of headers. Running post_headers hooks Reading 682 bytes of response body. Got 682 bytes. Read block (682 bytes): [ http://subversion.tigris.org/ xmlns/dav/" xmlns:ns0="DAV:"> http://subversion.tigris.org/ xmlns/dav/"> /client/trunk/ /client/!svn/vcc/ default trunk 571804c6-08da-4461-9039-976de9171a6e HTTP/1.1 200 OK ] Running post_send hooks Request ends, status 207 class 2xx, error line: 207 Multi-Status Running destroy hooks. Request ends. Running pre_send hooks compress: Initialization. compress: Initialization. Sending request headers: PROPFIND /client/!svn/vcc/default HTTP/1.1 User-Agent: SVN/1.6.11 (r934486) neon/0.29.3 Connection: TE TE: trailers Host: publicsvn.songbirdnest.com Content-Type: text/xml Accept-Encoding: gzip Depth: 0 DAV: http://subversion.tigris.org/xmlns/dav/svn/depth DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops Content-Length: 111 Accept-Encoding: gzip ... [not working] ... Sending request-line and headers: Sending request body: Body block (300 bytes): [] Request sent; retry is 1. [status-line] < HTTP/1.1 200 OK [hdr] Date: Sat, 22 May 2010 09:53:50 GMT Header Name: [date], Value: [Sat, 22 May 2010 09:53:50 GMT] [hdr] Server: Apache/2.2.8 (Ubuntu) DAV/2 SVN/1.4.6 mod_python/3.3.1 Python/2.5.2 Header Name: [server], Value: [Apache/2.2.8 (Ubuntu) DAV/2 SVN/1.4.6 mod_python/3.3.1 Python/2.5.2] [hdr] DAV: 1,2 Header Name: [dav], Value: [1,2] [hdr] DAV: version-control,checkout,working-resource Header Name: [dav], Value: [version-control,checkout,working-resource] [hdr] DAV: merge,baseline,activity,version-controlled-collection Header Name: [dav], Value: [merge,baseline,activity,version-controlled- collection] [hdr] MS-Author-Via: DAV Header Name: [ms-author-via], Value: [DAV] [hdr] Allow: OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,LOCK,UNLOCK,CHECKOUT Header Name: [allow], Value: [OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,LOCK,UNLOCK,CHECKOUT] [hdr] Content-Length: 186 Header Name: [content-length], Value: [186] [hdr] Keep-Alive: timeout=15, max=99 Header Name: [keep-alive], Value: [timeout=15, max=99] [hdr] Connection: Keep-Alive Header Name: [connection], Value: [Keep-Alive] [hdr] Content-Type: text/xml; charset="utf-8" Header Name: [content-type], Value: [text/xml; charset="utf-8"] [hdr] End of headers. Running post_headers hooks Reading 186 bytes of response body. Got 186 bytes. Read block (186 bytes): [ /client/!svn/act/ ] Request ends, status 200 class 2xx, error line: 200 OK Running destroy hooks. Request ends. svn: Données XML malformées sess: Destroying session. sess: Destroying session.
Re: Reintegrate a branch issue
On 21 mai, 23:57, "Michael Cole" wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the trunk. My question is two-fold: > > 1) After reintegration, I can delete my branch, correct? Yes indeed. In the worse case, we can still check out your branch at a specific revision or date. > > 2) When I attempt to reintegrate, I am getting the following error: > Error: Retrieval of mergeinfo unsupported by '...my repo path...'. The > research that I've done suggested I need to upgrade my server version of > Subversion, but I would like to avoid doing this because of the > corporate red tape. Any other suggestions? That's because you use a client version 1.5, don't you. As such, it tries to use a feature called "merge tracking" which is not supported by your server (supposely in version 1.4) You can either upgrade the server to v1.5 or downgrade the client to version 1.4 Régis
Re: Trying to revive a repo
On 19 mai, 19:22, Kevin Korb wrote: > We were backing up the repository files, but not a dump. We lost the server > and we're trying to restore the repo. > > When we run a svnadmin verify, we get this back... > > * Verified revision 0. > svnadmin: Revision file lacks trailing newline > > The files are all there, and they seem fine... How do we go about trying to > fix the issue? > > Any ideas would be greatly appreciated! I don't know for subversion but missing newlines are usually caused when you change OS. Windows, Unix, Mac and Mainframe encode newlines differently...
RE: Reintegrate a branch issue
Thank you. I believe I will downgrade my client. It's unfortunate that the newer versions don't have an option to work successfully with older server versions. What kind of advantages does merge tracking offer? -Original Message- From: Régis Décamps [mailto:deca...@users.sf.net] Sent: Saturday, May 22, 2010 5:21 AM To: users@subversion.apache.org Subject: Re: Reintegrate a branch issue On 21 mai, 23:57, "Michael Cole" wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the trunk. My question is two-fold: > > 1) After reintegration, I can delete my branch, correct? Yes indeed. In the worse case, we can still check out your branch at a specific revision or date. > > 2) When I attempt to reintegrate, I am getting the following error: > Error: Retrieval of mergeinfo unsupported by '...my repo path...'. The > research that I've done suggested I need to upgrade my server version of > Subversion, but I would like to avoid doing this because of the > corporate red tape. Any other suggestions? That's because you use a client version 1.5, don't you. As such, it tries to use a feature called "merge tracking" which is not supported by your server (supposely in version 1.4) You can either upgrade the server to v1.5 or downgrade the client to version 1.4 Régis
Certain files always appear in my reintegrate merges
Here's the situation: I just did a reintegrate from the HEAD of branch_X into trunk. I committed everything. At this point, the two branches should be identical. Afterwards, I didn't change either branch, except to commit the reintegrate itself to trunk, and to commit a record-only merge to branch_X, to block the reintegrate from being merged back. Now I update my copy of trunk, and repeat the exact same merge. I should see no changes, right? Wrong. I see two PDF files, that Subversion thinks were updated. EVERY TIME I do a reintegrate from this branch, these same two files show up as updates. Nobody is touching the files, and their contents are identical in both branches. Why is this happening? Jacob
Re: Certain files always appear in my reintegrate merges
Forgot to mention: I'm using SVN 1.6.11 client and 1.6.5 server. Jacob On May 22, 2010, at 7:31 PM, Jacob Weber wrote: > Here's the situation: I just did a reintegrate from the HEAD of branch_X into > trunk. I committed everything. > > At this point, the two branches should be identical. Afterwards, I didn't > change either branch, except to commit the reintegrate itself to trunk, and > to commit a record-only merge to branch_X, to block the reintegrate from > being merged back. > > Now I update my copy of trunk, and repeat the exact same merge. I should see > no changes, right? > > Wrong. I see two PDF files, that Subversion thinks were updated. EVERY TIME I > do a reintegrate from this branch, these same two files show up as updates. > Nobody is touching the files, and their contents are identical in both > branches. > > Why is this happening? > Jacob
