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

1.5.x currently doesn't build

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Tue, 16 Dec 2008 13:50:31 -0600

1.5.x currently doesn't build due to the merge in r34734, with this log message:
------------------------------------------------------------------------
r34734 | hwright | 2008-12-16 12:04:52 -0600 (Tue, 16 Dec 2008) | 15 lines

Merge r34385, r34393 from trunk:

 * r34385, r34393
   Fix broken merge when the merge target's natural history includes
   resurrections.
   Notes:
     r34385 is a new test. r34393 is the fix.
   Justification:
     This problem was encountered 'in the wild' - see
     http://svn.haxx.se/dev/archive-2008-11/0618.shtml. When encountered
     cherry harvest merges are completely broken.
   Votes:
     +1: pburba, stylesen, cmpilato

It turns out that r34393 introduced a call to
svn_mergeinfo__get_range_endpoints(), which was introduced on trunk in r34306.
r34306 is currently awaiting review as part of the
1.5.x-reintegrate-improvements branch.

I created the 1.5.x-build-fixes branch to attempt to fix the build, but I think
that merging the reintegrate-improvements branch would be the better solution.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985193

Received on 2008-12-16 20:51:00 CET

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