On 5/9/06, Syd Bauman <Syd_Bauman@brown.edu> wrote:
> [Problem initially described in the mail to which this is a reply,
> dated 2006-05-04 10:56-04, available at
> http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=48660]
>
> On the theory that it might be a timing issue with the connection or
> something like that, I tried merging one step at a time. I.e., rather
> than
> svn merge -r 1436:HEAD branch-path/ trunk-path/
> I tried
> svn merge -r 1436:1440 branch-path/ trunk-path/
> svn merge -r 1440:1441 branch-path/ trunk-path/
> svn merge -r 1441:1442 branch-path/ trunk-path/
> etc., choosing only those ranges for which svn log showed changes to
> my branch. The same problem occurred during 1443:1444, albeit at a
> different spot than I saw with 1436:HEAD. The error message (as
> always) is
> | svn: REPORT request failed on '/svnroot/tei/!svn/vcc/default'
> | svn: REPORT of '/svnroot/tei/!svn/vcc/default':
> | Could not read response body:
> | Secure connection truncated (https://svn.sourceforge.net)
>
> So it seems like there is no way to merge my branch back into the
> trunk. The changes on my branch have been very extensive,
> re-organizing the directory structure, etc. Luckily, however, the
> changes against the trunk in the meantime have been pretty minor. I
> have been able to create a working copy of my branch with the changes
> that have occurred in the trunk merged into it, using
> svn merge trunk-path/@1436 trunk-path/@HEAD branch-path/
>
> So what I have now is a local WC of the branch which has the state of
> play I want to have in the trunk. Would something like the following
> be a reasonable course of action?
> svn commit branch-path/
> svn move https://svn.sourceforge.net/svnroot/path-to-trunk/
> https://svn.sourceforge.net/svnroot/path-to-backup/
> svn move https://svn.sourceforge.net/svnroot/path-to-branch/
> https://svn.sourceforge.net/svnroot/path-to-trunk/
> Feels kinda risky. Is there some way I can do this client-side? I.e.,
> tell subversion to commit my WC branch-path/ into the server's
> path-to-trunk/? (Or does that sound even more risky?)
>
> I really like subversion quite a bit, and use it for my personal
> stuff via a server at my home all the time. (I can't seem to get the
> permissions and stuff set so that it can be served the way I want via
> https, but that's assuredly user error.) I would be distressed to
> find that this merge cannot be done, and thus to be forced to repeat
> the work on the trunk itself, but that's what I'm probably going to
> do on Thu if I can't figure this out. Sigh.
Honestly, this is the second time I've heard this kind of problem
reported with regard to a repository hosted on sourceforge. It sure
sounds like a problem specific to their setup, and as such it's kind
of difficult for anyone other than sourceforge to debug it.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 10 02:13:08 2006