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

Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build]

From: Mark Phippard <mphippard_at_collab.net>
Date: Thu, 18 Dec 2008 11:26:43 -0500

On Thu, Dec 18, 2008 at 11:08 AM, Paul Burba <ptburba_at_gmail.com> wrote:

>> $ svn-r-i merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/@34802 .
>> /home/julianfoad/src/subversion-grey/subversion/libsvn_ra_neon/util.c:592: (apr_err=175002)
>> svn: REPORT of '/repos/svn/!svn/bc/34802': 200 OK (http://svn.collab.net)
>
> Using http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements@34082
> I don't get any error:

I built the branch on Linux. I then checked out 1.5.x branch and get
this when I try to merge using the binaries from the reintegrate
branch:

$ svn merge --reintegrate
http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements
subversion/libsvn_ra_neon/util.c:592: (apr_err=175002)
svn: REPORT of '/repos/svn/!svn/bc/34810': 200 OK (http://svn.collab.net)

$ which svn
/tmp/svn-1.5/bin/svn
$ svn --version
svn, version 1.5.5 (dev build)
   compiled Dec 18 2008, 08:17:27

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986789
Received on 2008-12-18 17:27:02 CET

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