You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Hyrum K. Wright" <hy...@mail.utexas.edu> on 2008/12/16 19:50:31 UTC
1.5.x currently doesn't build
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
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by "C. Michael Pilato" <cm...@collab.net>.
C. Michael Pilato wrote:
> Julian Foad wrote:
>> The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
>
> I think this bit from error_log on svn.collab.net maps to your error.
>
> [Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] Provider\
> encountered an error while streaming a REPORT response. [404, #0]
> [Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] Error wr\
> iting REPORT response. [404, #160013]
> [Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] File not\
> found: revision 34802, path '/ts/scratch-pad.txt' [404, #160013]
>
Just to wrap up this subthread, this turned out to be a problem with
libsvn_ra_neon's parsing logic for the "mergeinfo" REPORT. The bug has
existed since that RA function was first implemented, but was of the sort
that only got triggered if the HTTP request response was chunked in a very
particular way. Anyway, it's been fixed and backported to 1.5.5. (Though,
I don't see anything in CHANGES about it...)
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=989792
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by "C. Michael Pilato" <cm...@collab.net>.
Julian Foad wrote:
> The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
I think this bit from error_log on svn.collab.net maps to your error.
[Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] Provider\
encountered an error while streaming a REPORT response. [404, #0]
[Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] Error wr\
iting REPORT response. [404, #160013]
[Thu Dec 18 06:47:06 2008] [error] [client 217.169.20.120] File not\
found: revision 34802, path '/ts/scratch-pad.txt' [404, #160013]
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986740
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Dec 18, 2008 at 8:59 AM, Julian Foad <ju...@btopenworld.com> wrote:
> Paul Burba wrote:
>> Done. I've locally reintegrated the 1.5.x-reintegrate-improvements to
>> 1.5.x and ran the [FSFS]x[LOCAL] tests with no failures.
>>
>> One oddity, when I did the merge I got an unexpected conflict on merge.c:
>>
>> >svn info
>> Path: .
>> URL: http://svn.collab.net/repos/svn/branches/1.5.x
>> Repository Root: http://svn.collab.net/repos/svn
>> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
>> Revision: 34802
>> Node Kind: directory
>> Schedule: normal
>> Last Changed Author: hwright
>> Last Changed Rev: 34799
>> Last Changed Date: 2008-12-17 15:20:41 -0500 (Wed, 17 Dec 2008)
>>
>> >svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements .
>> --- Merging differences between repository URLs into '.':
>> U STATUS
>> G www\images\subversion-diagram.png
>> G www\images\subversion_logo-200x173.png
>> G www\images\subversion_logo_hor-468x64.png
>> G www\images\subversion_logo-384x332.png
>> G COMMITTERS
>> G notes\tree-conflicts\scratch-pad.txt
>> U subversion\libsvn_fs_base\tree.c
>> U subversion\libsvn_fs_base\fs.c
>> U subversion\include\svn_mergeinfo.h
>> U subversion\include\svn_client.h
>> U subversion\include\private\svn_mergeinfo_private.h
>> G subversion\include\private
>> UG subversion\libsvn_wc\adm_ops.c
>> U subversion\libsvn_subr\mergeinfo.c
>> G subversion\libsvn_subr
>> Conflict discovered in 'subversion/libsvn_client/merge.c'.
>> Select: (p) postpone, (df) diff-full, (e) edit,
>> (mc) mine-conflict, (tc) theirs-conflict,
>> (s) show all options: p
>> CG subversion\libsvn_client\merge.c
>> U subversion\libsvn_client\ra.c
>> U subversion\libsvn_client\copy.c
>> G subversion\bindings\swig
>> U subversion\mod_dav_svn\mirror.c
>> U subversion\tests\cmdline\revert_tests.py
>> U subversion\tests\cmdline\copy_tests.py
>> U subversion\tests\cmdline\update_tests.py
>> UG subversion\tests\cmdline\svntest\actions.py
>> U subversion\tests\cmdline\merge_tests.py
>> U subversion\libsvn_ra_svn\cyrus_auth.c
>> U subversion\libsvn_ra_svn\internal_auth.c
>> U subversion\libsvn_ra_svn\ra_svn.h
>> G CHANGES
>> G .
>> Summary of conflicts:
>> Text conflicts: 1
>>
>> The conflict was on the whole file:
>>
>> >svn diff subversion\libsvn_client\merge.c
>> Index: subversion/libsvn_client/merge.c
>> ===================================================================
>> --- subversion/libsvn_client/merge.c (revision 34802)
>> +++ subversion/libsvn_client/merge.c (working copy)
>> @@ -1,3 +1,4 @@
>> +<<<<<<< .working
>> /*
>> * merge.c: merging
>> *
>> @@ -7086,3 +7087,7473 @@
>> target_wcpath, recurse, ignore_ancestry, force,
>> dry_run, NULL, ctx, pool);
>> }
>> +=======
>> +/*
>> + * merge.c: merging
>>
>> <SNIP the whole right side file added>
>>
>> + target_wcpath, recurse, ignore_ancestry, force,
>> + dry_run, NULL, ctx, pool);
>> +}
>> +>>>>>>> .merge-right.r34802
>
> Paul,
>
> When I tried to reproduce, I got some odd results:
>
> (I reverted to a clean WC before each of these attempts.)
>
> [[[
> $ svn-trunk info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/1.5.x
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 34802
> Node Kind: directory
> Schedule: normal
> Last Changed Author: hwright
> Last Changed Rev: 34799
> Last Changed Date: 2008-12-17 20:20:41 +0000 (Wed, 17 Dec 2008)
>
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> --- Merging differences between repository URLs into '.':
> G www/images/subversion-diagram.png
> G www/images/subversion_logo-200x173.png
> G www/images/subversion_logo_hor-468x64.png
> G www/images/subversion_logo-384x332.png
> G COMMITTERS
> G notes/tree-conflicts/scratch-pad.txt
> U subversion/include/private/svn_mergeinfo_private.h
> G subversion/include/private
> G subversion/libsvn_wc/adm_ops.c
> U subversion/libsvn_subr/mergeinfo.c
> G subversion/libsvn_subr
> UG subversion/libsvn_client/merge.c
> G subversion/bindings/swig
> G subversion/tests/cmdline/svntest/actions.py
> U subversion/tests/cmdline/merge_tests.py
> G CHANGES
> G .
>
> $ svn-1.5.4 merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ 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)
>
> $ svn-r-i merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c subversion/libsvn_client/merge.c
> --- Merging differences between repository URLs into 'subversion/libsvn_client/merge.c':
> UG subversion/libsvn_client/merge.c
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> /home/julianfoad/src/subversion-trunk/subversion/libsvn_ra_neon/util.c:603: (apr_err=175002)
> svn: REPORT of '/repos/svn/!svn/bc/34802': 200 OK (http://svn.collab.net)
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client@34802 subversion/libsvn_client
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client subversion/libsvn_client
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> ]]]
>
> The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
Agreed, trying to replicate right now.
> Local WC is /branches/1.5.x@34802
> svn-1.5.4 is v1.5.4
> svn-r-i is /branches/1.5.x-reintegrate-improvements@34802
> svn-trunk is /trunk@34721
>
> Which version of svn did you use?
trunk@34807
> A couple of fixes to merging EOL-style changes were recently merged into
> 1.5.x at r34799. What you saw looks like it might be an EOL-style bug.
I'll look into this some more today, I hit it right at the end of the
day yesterday so didn't go too far with it.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986699
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by Mark Phippard <mp...@collab.net>.
On Thu, Dec 18, 2008 at 11:08 AM, Paul Burba <pt...@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
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by Julian Foad <ju...@btopenworld.com>.
On Thu, 2008-12-18 at 11:08 -0500, Paul Burba wrote:
> On Thu, Dec 18, 2008 at 8:59 AM, Julian Foad <ju...@btopenworld.com> wrote:
> > Paul Burba wrote:
> >> Done. I've locally reintegrated the 1.5.x-reintegrate-improvements to
> >> 1.5.x and ran the [FSFS]x[LOCAL] tests with no failures.
> >>
> >> One oddity, when I did the merge I got an unexpected conflict on merge.c:
> >>
> >> >svn info
> >> Path: .
> >> URL: http://svn.collab.net/repos/svn/branches/1.5.x
> >> Repository Root: http://svn.collab.net/repos/svn
> >> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> >> Revision: 34802
> >> Node Kind: directory
> >> Schedule: normal
> >> Last Changed Author: hwright
> >> Last Changed Rev: 34799
> >> Last Changed Date: 2008-12-17 15:20:41 -0500 (Wed, 17 Dec 2008)
> >>
> >> >svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements .
> >> --- Merging differences between repository URLs into '.':
> >> U STATUS
> >> G www\images\subversion-diagram.png
> >> G www\images\subversion_logo-200x173.png
> >> G www\images\subversion_logo_hor-468x64.png
> >> G www\images\subversion_logo-384x332.png
> >> G COMMITTERS
> >> G notes\tree-conflicts\scratch-pad.txt
> >> U subversion\libsvn_fs_base\tree.c
> >> U subversion\libsvn_fs_base\fs.c
> >> U subversion\include\svn_mergeinfo.h
> >> U subversion\include\svn_client.h
> >> U subversion\include\private\svn_mergeinfo_private.h
> >> G subversion\include\private
> >> UG subversion\libsvn_wc\adm_ops.c
> >> U subversion\libsvn_subr\mergeinfo.c
> >> G subversion\libsvn_subr
> >> Conflict discovered in 'subversion/libsvn_client/merge.c'.
> >> Select: (p) postpone, (df) diff-full, (e) edit,
> >> (mc) mine-conflict, (tc) theirs-conflict,
> >> (s) show all options: p
> >> CG subversion\libsvn_client\merge.c
> >> U subversion\libsvn_client\ra.c
> >> U subversion\libsvn_client\copy.c
> >> G subversion\bindings\swig
> >> U subversion\mod_dav_svn\mirror.c
> >> U subversion\tests\cmdline\revert_tests.py
> >> U subversion\tests\cmdline\copy_tests.py
> >> U subversion\tests\cmdline\update_tests.py
> >> UG subversion\tests\cmdline\svntest\actions.py
> >> U subversion\tests\cmdline\merge_tests.py
> >> U subversion\libsvn_ra_svn\cyrus_auth.c
> >> U subversion\libsvn_ra_svn\internal_auth.c
> >> U subversion\libsvn_ra_svn\ra_svn.h
> >> G CHANGES
> >> G .
> >> Summary of conflicts:
> >> Text conflicts: 1
> >>
> >> The conflict was on the whole file:
> >>
> >> >svn diff subversion\libsvn_client\merge.c
> >> Index: subversion/libsvn_client/merge.c
> >> ===================================================================
> >> --- subversion/libsvn_client/merge.c (revision 34802)
> >> +++ subversion/libsvn_client/merge.c (working copy)
> >> @@ -1,3 +1,4 @@
> >> +<<<<<<< .working
> >> /*
> >> * merge.c: merging
> >> *
> >> @@ -7086,3 +7087,7473 @@
> >> target_wcpath, recurse, ignore_ancestry, force,
> >> dry_run, NULL, ctx, pool);
> >> }
> >> +=======
> >> +/*
> >> + * merge.c: merging
> >>
> >> <SNIP the whole right side file added>
> >>
> >> + target_wcpath, recurse, ignore_ancestry, force,
> >> + dry_run, NULL, ctx, pool);
> >> +}
> >> +>>>>>>> .merge-right.r34802
> >
> > Paul,
> >
> > When I tried to reproduce, I got some odd results:
> >
> > (I reverted to a clean WC before each of these attempts.)
> >
> > [[[
> > $ svn-trunk info
> > Path: .
> > URL: http://svn.collab.net/repos/svn/branches/1.5.x
> > Repository Root: http://svn.collab.net/repos/svn
> > Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> > Revision: 34802
> > Node Kind: directory
> > Schedule: normal
> > Last Changed Author: hwright
> > Last Changed Rev: 34799
> > Last Changed Date: 2008-12-17 20:20:41 +0000 (Wed, 17 Dec 2008)
> >
> >
> > $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> > --- Merging differences between repository URLs into '.':
> > G www/images/subversion-diagram.png
> > G www/images/subversion_logo-200x173.png
> > G www/images/subversion_logo_hor-468x64.png
> > G www/images/subversion_logo-384x332.png
> > G COMMITTERS
> > G notes/tree-conflicts/scratch-pad.txt
> > U subversion/include/private/svn_mergeinfo_private.h
> > G subversion/include/private
> > G subversion/libsvn_wc/adm_ops.c
> > U subversion/libsvn_subr/mergeinfo.c
> > G subversion/libsvn_subr
> > UG subversion/libsvn_client/merge.c
> > G subversion/bindings/swig
> > G subversion/tests/cmdline/svntest/actions.py
> > U subversion/tests/cmdline/merge_tests.py
> > G CHANGES
> > G .
>
> I'm not sure whether to be happy or sad that you don't get that odd
> conflict on merge.c (but that is another topic).
>
> > $ svn-1.5.4 merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> > svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> > Some revisions have been merged under it that have not been merged
> > into the reintegration target; merge them first, then retry.
>
> Agreed, this is expected with 1.5.4.
>
> > $ 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:
> > $ svn-r-i merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c subversion/libsvn_client/merge.c
> > --- Merging differences between repository URLs into 'subversion/libsvn_client/merge.c':
> > UG subversion/libsvn_client/merge.c
> >
> > $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> > /home/julianfoad/src/subversion-trunk/subversion/libsvn_ra_neon/util.c:603: (apr_err=175002)
> > svn: REPORT of '/repos/svn/!svn/bc/34802': 200 OK (http://svn.collab.net)
>
> Also works for me,
[...]
> > $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client@34802 subversion/libsvn_client
> > /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> > svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> > Some revisions have been merged under it that have not been merged
> > into the reintegration target; merge them first, then retry.
>
> Are you sure that svn-trunk is trunk@34721? That error message was
> changed in r34091.
Oh, I see what you're saying. I couldn't have got this message from
trunk >= 34091. Hmm. My "svn-trunk" etc. were shell aliases pointing to
built versions. I quite possibly updated and built a version in between
gathering some of these results. Sorry, I must have messed up.
But now I can't reproduce with any of the trunk versions I've been
trying: trunk@34721 or trunk@34764 or trunk@34807. Nor
with /branches/1.5.x-reintegrate-improvements@34521. Aargh!
- Julian
> > $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> > /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> > svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> > Some revisions have been merged under it that have not been merged
> > into the reintegration target; merge them first, then retry.
> >
> > $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> > /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> > svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> > Some revisions have been merged under it that have not been merged
> > into the reintegration target; merge them first, then retry.
> >
> > $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client subversion/libsvn_client
> > /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> > svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> > Some revisions have been merged under it that have not been merged
> > into the reintegration target; merge them first, then retry.
> >
> > ]]]
> >
> > The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
> >
> > Local WC is /branches/1.5.x@34802
> > svn-1.5.4 is v1.5.4
> > svn-r-i is /branches/1.5.x-reintegrate-improvements@34802
> > svn-trunk is /trunk@34721
> >
> > Which version of svn did you use?
> >
> > A couple of fixes to merging EOL-style changes were recently merged into
> > 1.5.x at r34799. What you saw looks like it might be an EOL-style bug.
> >
> > - Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986897
Re: Problems merging the reintegrate-improvements branch [was:
1.5.x currently doesn't build]
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Dec 18, 2008 at 8:59 AM, Julian Foad <ju...@btopenworld.com> wrote:
> Paul Burba wrote:
>> Done. I've locally reintegrated the 1.5.x-reintegrate-improvements to
>> 1.5.x and ran the [FSFS]x[LOCAL] tests with no failures.
>>
>> One oddity, when I did the merge I got an unexpected conflict on merge.c:
>>
>> >svn info
>> Path: .
>> URL: http://svn.collab.net/repos/svn/branches/1.5.x
>> Repository Root: http://svn.collab.net/repos/svn
>> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
>> Revision: 34802
>> Node Kind: directory
>> Schedule: normal
>> Last Changed Author: hwright
>> Last Changed Rev: 34799
>> Last Changed Date: 2008-12-17 15:20:41 -0500 (Wed, 17 Dec 2008)
>>
>> >svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements .
>> --- Merging differences between repository URLs into '.':
>> U STATUS
>> G www\images\subversion-diagram.png
>> G www\images\subversion_logo-200x173.png
>> G www\images\subversion_logo_hor-468x64.png
>> G www\images\subversion_logo-384x332.png
>> G COMMITTERS
>> G notes\tree-conflicts\scratch-pad.txt
>> U subversion\libsvn_fs_base\tree.c
>> U subversion\libsvn_fs_base\fs.c
>> U subversion\include\svn_mergeinfo.h
>> U subversion\include\svn_client.h
>> U subversion\include\private\svn_mergeinfo_private.h
>> G subversion\include\private
>> UG subversion\libsvn_wc\adm_ops.c
>> U subversion\libsvn_subr\mergeinfo.c
>> G subversion\libsvn_subr
>> Conflict discovered in 'subversion/libsvn_client/merge.c'.
>> Select: (p) postpone, (df) diff-full, (e) edit,
>> (mc) mine-conflict, (tc) theirs-conflict,
>> (s) show all options: p
>> CG subversion\libsvn_client\merge.c
>> U subversion\libsvn_client\ra.c
>> U subversion\libsvn_client\copy.c
>> G subversion\bindings\swig
>> U subversion\mod_dav_svn\mirror.c
>> U subversion\tests\cmdline\revert_tests.py
>> U subversion\tests\cmdline\copy_tests.py
>> U subversion\tests\cmdline\update_tests.py
>> UG subversion\tests\cmdline\svntest\actions.py
>> U subversion\tests\cmdline\merge_tests.py
>> U subversion\libsvn_ra_svn\cyrus_auth.c
>> U subversion\libsvn_ra_svn\internal_auth.c
>> U subversion\libsvn_ra_svn\ra_svn.h
>> G CHANGES
>> G .
>> Summary of conflicts:
>> Text conflicts: 1
>>
>> The conflict was on the whole file:
>>
>> >svn diff subversion\libsvn_client\merge.c
>> Index: subversion/libsvn_client/merge.c
>> ===================================================================
>> --- subversion/libsvn_client/merge.c (revision 34802)
>> +++ subversion/libsvn_client/merge.c (working copy)
>> @@ -1,3 +1,4 @@
>> +<<<<<<< .working
>> /*
>> * merge.c: merging
>> *
>> @@ -7086,3 +7087,7473 @@
>> target_wcpath, recurse, ignore_ancestry, force,
>> dry_run, NULL, ctx, pool);
>> }
>> +=======
>> +/*
>> + * merge.c: merging
>>
>> <SNIP the whole right side file added>
>>
>> + target_wcpath, recurse, ignore_ancestry, force,
>> + dry_run, NULL, ctx, pool);
>> +}
>> +>>>>>>> .merge-right.r34802
>
> Paul,
>
> When I tried to reproduce, I got some odd results:
>
> (I reverted to a clean WC before each of these attempts.)
>
> [[[
> $ svn-trunk info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/1.5.x
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 34802
> Node Kind: directory
> Schedule: normal
> Last Changed Author: hwright
> Last Changed Rev: 34799
> Last Changed Date: 2008-12-17 20:20:41 +0000 (Wed, 17 Dec 2008)
>
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> --- Merging differences between repository URLs into '.':
> G www/images/subversion-diagram.png
> G www/images/subversion_logo-200x173.png
> G www/images/subversion_logo_hor-468x64.png
> G www/images/subversion_logo-384x332.png
> G COMMITTERS
> G notes/tree-conflicts/scratch-pad.txt
> U subversion/include/private/svn_mergeinfo_private.h
> G subversion/include/private
> G subversion/libsvn_wc/adm_ops.c
> U subversion/libsvn_subr/mergeinfo.c
> G subversion/libsvn_subr
> UG subversion/libsvn_client/merge.c
> G subversion/bindings/swig
> G subversion/tests/cmdline/svntest/actions.py
> U subversion/tests/cmdline/merge_tests.py
> G CHANGES
> G .
I'm not sure whether to be happy or sad that you don't get that odd
conflict on merge.c (but that is another topic).
> $ svn-1.5.4 merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
Agreed, this is expected with 1.5.4.
> $ 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:
1.5.x-r-i.34802.DEBUG>svn merge --reintegrate
http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/@34802
.
--- Merging differences between repository URLs into '.':
U STATUS
G www\images\subversion-diagram.png
G www\images\subversion_logo-200x173.png
G www\images\subversion_logo_hor-468x64.png
G www\images\subversion_logo-384x332.png
G COMMITTERS
G notes\tree-conflicts\scratch-pad.txt
U subversion\libsvn_fs_base\tree.c
U subversion\libsvn_fs_base\fs.c
U subversion\include\svn_mergeinfo.h
U subversion\include\svn_client.h
U subversion\include\private\svn_mergeinfo_private.h
G subversion\include\private
UG subversion\libsvn_wc\adm_ops.c
U subversion\libsvn_subr\mergeinfo.c
G subversion\libsvn_subr
Conflict discovered in 'subversion/libsvn_client/merge.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: p
CG subversion\libsvn_client\merge.c
U subversion\libsvn_client\ra.c
U subversion\libsvn_client\copy.c
G subversion\bindings\swig
U subversion\mod_dav_svn\mirror.c
U subversion\tests\cmdline\revert_tests.py
U subversion\tests\cmdline\copy_tests.py
U subversion\tests\cmdline\update_tests.py
UG subversion\tests\cmdline\svntest\actions.py
U subversion\tests\cmdline\merge_tests.py
U subversion\libsvn_ra_svn\cyrus_auth.c
U subversion\libsvn_ra_svn\internal_auth.c
U subversion\libsvn_ra_svn\ra_svn.h
G CHANGES
G .
> $ svn-r-i merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c subversion/libsvn_client/merge.c
> --- Merging differences between repository URLs into 'subversion/libsvn_client/merge.c':
> UG subversion/libsvn_client/merge.c
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> /home/julianfoad/src/subversion-trunk/subversion/libsvn_ra_neon/util.c:603: (apr_err=175002)
> svn: REPORT of '/repos/svn/!svn/bc/34802': 200 OK (http://svn.collab.net)
Also works for me,
trunk.34721.DEBUG>svn merge --reintegrate
http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/@34802
.
--- Merging differences between repository URLs into '.':
U STATUS
G www\images\subversion-diagram.png
G www\images\subversion_logo-200x173.png
G www\images\subversion_logo_hor-468x64.png
G www\images\subversion_logo-384x332.png
G COMMITTERS
G notes\tree-conflicts\scratch-pad.txt
U subversion\libsvn_fs_base\tree.c
U subversion\libsvn_fs_base\fs.c
U subversion\include\svn_mergeinfo.h
U subversion\include\svn_client.h
U subversion\include\private\svn_mergeinfo_private.h
G subversion\include\private
UG subversion\libsvn_wc\adm_ops.c
U subversion\libsvn_subr\mergeinfo.c
G subversion\libsvn_subr
Conflict discovered in 'subversion/libsvn_client/merge.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
CG subversion\libsvn_client\merge.c
U subversion\libsvn_client\ra.c
U subversion\libsvn_client\copy.c
G subversion\bindings\swig
U subversion\mod_dav_svn\mirror.c
U subversion\tests\cmdline\revert_tests.py
U subversion\tests\cmdline\copy_tests.py
U subversion\tests\cmdline\update_tests.py
UG subversion\tests\cmdline\svntest\actions.py
U subversion\tests\cmdline\merge_tests.py
U subversion\libsvn_ra_svn\cyrus_auth.c
U subversion\libsvn_ra_svn\internal_auth.c
U subversion\libsvn_ra_svn\ra_svn.h
G CHANGES
G .
Summary of conflicts:
Text conflicts: 1
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client@34802 subversion/libsvn_client
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
Are you sure that svn-trunk is trunk@34721? That error message was
changed in r34091.
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> $ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client subversion/libsvn_client
> /home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> ]]]
>
> The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
>
> Local WC is /branches/1.5.x@34802
> svn-1.5.4 is v1.5.4
> svn-r-i is /branches/1.5.x-reintegrate-improvements@34802
> svn-trunk is /trunk@34721
>
> Which version of svn did you use?
>
> A couple of fixes to merging EOL-style changes were recently merged into
> 1.5.x at r34799. What you saw looks like it might be an EOL-style bug.
>
> - Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986777
Problems merging the reintegrate-improvements branch [was: 1.5.x
currently doesn't build]
Posted by Julian Foad <ju...@btopenworld.com>.
Paul Burba wrote:
> Done. I've locally reintegrated the 1.5.x-reintegrate-improvements to
> 1.5.x and ran the [FSFS]x[LOCAL] tests with no failures.
>
> One oddity, when I did the merge I got an unexpected conflict on merge.c:
>
> >svn info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/1.5.x
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 34802
> Node Kind: directory
> Schedule: normal
> Last Changed Author: hwright
> Last Changed Rev: 34799
> Last Changed Date: 2008-12-17 15:20:41 -0500 (Wed, 17 Dec 2008)
>
> >svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements .
> --- Merging differences between repository URLs into '.':
> U STATUS
> G www\images\subversion-diagram.png
> G www\images\subversion_logo-200x173.png
> G www\images\subversion_logo_hor-468x64.png
> G www\images\subversion_logo-384x332.png
> G COMMITTERS
> G notes\tree-conflicts\scratch-pad.txt
> U subversion\libsvn_fs_base\tree.c
> U subversion\libsvn_fs_base\fs.c
> U subversion\include\svn_mergeinfo.h
> U subversion\include\svn_client.h
> U subversion\include\private\svn_mergeinfo_private.h
> G subversion\include\private
> UG subversion\libsvn_wc\adm_ops.c
> U subversion\libsvn_subr\mergeinfo.c
> G subversion\libsvn_subr
> Conflict discovered in 'subversion/libsvn_client/merge.c'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: p
> CG subversion\libsvn_client\merge.c
> U subversion\libsvn_client\ra.c
> U subversion\libsvn_client\copy.c
> G subversion\bindings\swig
> U subversion\mod_dav_svn\mirror.c
> U subversion\tests\cmdline\revert_tests.py
> U subversion\tests\cmdline\copy_tests.py
> U subversion\tests\cmdline\update_tests.py
> UG subversion\tests\cmdline\svntest\actions.py
> U subversion\tests\cmdline\merge_tests.py
> U subversion\libsvn_ra_svn\cyrus_auth.c
> U subversion\libsvn_ra_svn\internal_auth.c
> U subversion\libsvn_ra_svn\ra_svn.h
> G CHANGES
> G .
> Summary of conflicts:
> Text conflicts: 1
>
> The conflict was on the whole file:
>
> >svn diff subversion\libsvn_client\merge.c
> Index: subversion/libsvn_client/merge.c
> ===================================================================
> --- subversion/libsvn_client/merge.c (revision 34802)
> +++ subversion/libsvn_client/merge.c (working copy)
> @@ -1,3 +1,4 @@
> +<<<<<<< .working
> /*
> * merge.c: merging
> *
> @@ -7086,3 +7087,7473 @@
> target_wcpath, recurse, ignore_ancestry, force,
> dry_run, NULL, ctx, pool);
> }
> +=======
> +/*
> + * merge.c: merging
>
> <SNIP the whole right side file added>
>
> + target_wcpath, recurse, ignore_ancestry, force,
> + dry_run, NULL, ctx, pool);
> +}
> +>>>>>>> .merge-right.r34802
Paul,
When I tried to reproduce, I got some odd results:
(I reverted to a clean WC before each of these attempts.)
[[[
$ svn-trunk info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 34802
Node Kind: directory
Schedule: normal
Last Changed Author: hwright
Last Changed Rev: 34799
Last Changed Date: 2008-12-17 20:20:41 +0000 (Wed, 17 Dec 2008)
$ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
--- Merging differences between repository URLs into '.':
G www/images/subversion-diagram.png
G www/images/subversion_logo-200x173.png
G www/images/subversion_logo_hor-468x64.png
G www/images/subversion_logo-384x332.png
G COMMITTERS
G notes/tree-conflicts/scratch-pad.txt
U subversion/include/private/svn_mergeinfo_private.h
G subversion/include/private
G subversion/libsvn_wc/adm_ops.c
U subversion/libsvn_subr/mergeinfo.c
G subversion/libsvn_subr
UG subversion/libsvn_client/merge.c
G subversion/bindings/swig
G subversion/tests/cmdline/svntest/actions.py
U subversion/tests/cmdline/merge_tests.py
G CHANGES
G .
$ svn-1.5.4 merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
$ 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)
$ svn-r-i merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c subversion/libsvn_client/merge.c
--- Merging differences between repository URLs into 'subversion/libsvn_client/merge.c':
UG subversion/libsvn_client/merge.c
$ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
/home/julianfoad/src/subversion-trunk/subversion/libsvn_ra_neon/util.c:603: (apr_err=175002)
svn: REPORT of '/repos/svn/!svn/bc/34802': 200 OK (http://svn.collab.net)
$ svn-trunk merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client@34802 subversion/libsvn_client
/home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
$ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements@34802 .
/home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
$ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements .
/home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
$ svn-1.5.x merge --reintegrate $SVN_REPOS/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client subversion/libsvn_client
/home/julianfoad/src/subversion-red/subversion/libsvn_client/merge.c:6723: (apr_err=195016)
svn: Cannot reintegrate from 'http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
]]]
The 1.5.4 bail-out is not surprising to me, but the "200 OK" "errors" are troubling.
Local WC is /branches/1.5.x@34802
svn-1.5.4 is v1.5.4
svn-r-i is /branches/1.5.x-reintegrate-improvements@34802
svn-trunk is /trunk@34721
Which version of svn did you use?
A couple of fixes to merging EOL-style changes were recently merged into
1.5.x at r34799. What you saw looks like it might be an EOL-style bug.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986670
Re: 1.5.x currently doesn't build
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Dec 17, 2008 at 11:05 AM, Paul Burba <pt...@gmail.com> wrote:
> On Wed, Dec 17, 2008 at 11:00 AM, Hyrum K. Wright
> <hy...@mail.utexas.edu> wrote:
>> Paul Burba wrote:
>>> On Wed, Dec 17, 2008 at 10:06 AM, Hyrum K. Wright
>>> <hy...@mail.utexas.edu> wrote:
>>>> Julian Foad wrote:
>>>>> On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
>>>>>> 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.
>>>>> On 1.5.x-build-fixes I get:
>>>>>
>>>>> subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
>>>>> 'svn_mergeinfo__catalog_to_formatted_string'
>>>>> subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
>>>>> 'svn_mergeinfo__to_formatted_string'
>>>>>
>>>>> Those two functions appear to be redundant in the 1.5.x-build-fixes
>>>>> branch. That means in one sense that the warnings are harmless, but in
>>>>> another sense it's wrong to include them because they are not part of
>>>>> the fix. They were added to that branch as part of r34740 and then a
>>>>> further change r34741 was made to support them.
>>>>>
>>>>> Shouldn't we revert the bad merge straight away? All this proposing to
>>>>> fix it, and voting on the fix, while the branch is still broken, is
>>>>> getting in the way of reviewing further back-ports.
>>>> My preference (and the correct way to do it, IIUC) is to merge the reintegrate
>>>> improvements, which includes r34306 in its entirety, to 1.5.x. That branch is
>>>> still lacking a +1, so maybe we should focus review efforts there.
>>>
>>> Ok, if the reintegrate improvements are backported we can do that,
>>> making all of this moot. Assuming they are not, then we can revert
>>> the "bad" merge of r34385 and r34393 and then I can renominate those
>>> changes along with (the parts? of) r34306 that are required.
>>>
>>> The only real question is how long to wait to find out if the
>>> reintegrate improvements are going in or not. Is anyone looking at
>>> those right now?
>>
>> Paul,
>> I'm in the midst of merging the build-fixes branch to 1.5.x (running tests now)
>> so 1.5.x will be back to a stable state for further review. Given that there
>> may be conflicts between build-fixes and the reintegrate-improvements branch, do
>> you want to bring reintegrate-improvements up-to-date with 1.5.x after I merge?
>
> Will do
Done. I've locally reintegrated the 1.5.x-reintegrate-improvements to
1.5.x and ran the [FSFS]x[LOCAL] tests with no failures.
One oddity, when I did the merge I got an unexpected conflict on merge.c:
>svn info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 34802
Node Kind: directory
Schedule: normal
Last Changed Author: hwright
Last Changed Rev: 34799
Last Changed Date: 2008-12-17 15:20:41 -0500 (Wed, 17 Dec 2008)
>svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements .
--- Merging differences between repository URLs into '.':
U STATUS
G www\images\subversion-diagram.png
G www\images\subversion_logo-200x173.png
G www\images\subversion_logo_hor-468x64.png
G www\images\subversion_logo-384x332.png
G COMMITTERS
G notes\tree-conflicts\scratch-pad.txt
U subversion\libsvn_fs_base\tree.c
U subversion\libsvn_fs_base\fs.c
U subversion\include\svn_mergeinfo.h
U subversion\include\svn_client.h
U subversion\include\private\svn_mergeinfo_private.h
G subversion\include\private
UG subversion\libsvn_wc\adm_ops.c
U subversion\libsvn_subr\mergeinfo.c
G subversion\libsvn_subr
Conflict discovered in 'subversion/libsvn_client/merge.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
CG subversion\libsvn_client\merge.c
U subversion\libsvn_client\ra.c
U subversion\libsvn_client\copy.c
G subversion\bindings\swig
U subversion\mod_dav_svn\mirror.c
U subversion\tests\cmdline\revert_tests.py
U subversion\tests\cmdline\copy_tests.py
U subversion\tests\cmdline\update_tests.py
UG subversion\tests\cmdline\svntest\actions.py
U subversion\tests\cmdline\merge_tests.py
U subversion\libsvn_ra_svn\cyrus_auth.c
U subversion\libsvn_ra_svn\internal_auth.c
U subversion\libsvn_ra_svn\ra_svn.h
G CHANGES
G .
Summary of conflicts:
Text conflicts: 1
The conflict was on the whole file:
>svn diff subversion\libsvn_client\merge.c
Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 34802)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -1,3 +1,4 @@
+<<<<<<< .working
/*
* merge.c: merging
*
@@ -7086,3 +7087,7473 @@
target_wcpath, recurse, ignore_ancestry, force,
dry_run, NULL, ctx, pool);
}
+=======
+/*
+ * merge.c: merging
<SNIP the whole right side file added>
+ target_wcpath, recurse, ignore_ancestry, force,
+ dry_run, NULL, ctx, pool);
+}
+>>>>>>> .merge-right.r34802
Since there were no changes to merge.c on 1.5.x since I last synched
1.5.x-reintegrate-improvements with it I just ran svn resolve --accept
theirs-full subversion\libsvn_client\merge.c and this gave what I
expected.
Anyone know what happened here? Am I missing something simple?
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986128
Re: 1.5.x currently doesn't build
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Dec 17, 2008 at 11:00 AM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> Paul Burba wrote:
>> On Wed, Dec 17, 2008 at 10:06 AM, Hyrum K. Wright
>> <hy...@mail.utexas.edu> wrote:
>>> Julian Foad wrote:
>>>> On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
>>>>> 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.
>>>> On 1.5.x-build-fixes I get:
>>>>
>>>> subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
>>>> 'svn_mergeinfo__catalog_to_formatted_string'
>>>> subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
>>>> 'svn_mergeinfo__to_formatted_string'
>>>>
>>>> Those two functions appear to be redundant in the 1.5.x-build-fixes
>>>> branch. That means in one sense that the warnings are harmless, but in
>>>> another sense it's wrong to include them because they are not part of
>>>> the fix. They were added to that branch as part of r34740 and then a
>>>> further change r34741 was made to support them.
>>>>
>>>> Shouldn't we revert the bad merge straight away? All this proposing to
>>>> fix it, and voting on the fix, while the branch is still broken, is
>>>> getting in the way of reviewing further back-ports.
>>> My preference (and the correct way to do it, IIUC) is to merge the reintegrate
>>> improvements, which includes r34306 in its entirety, to 1.5.x. That branch is
>>> still lacking a +1, so maybe we should focus review efforts there.
>>
>> Ok, if the reintegrate improvements are backported we can do that,
>> making all of this moot. Assuming they are not, then we can revert
>> the "bad" merge of r34385 and r34393 and then I can renominate those
>> changes along with (the parts? of) r34306 that are required.
>>
>> The only real question is how long to wait to find out if the
>> reintegrate improvements are going in or not. Is anyone looking at
>> those right now?
>
> Paul,
> I'm in the midst of merging the build-fixes branch to 1.5.x (running tests now)
> so 1.5.x will be back to a stable state for further review. Given that there
> may be conflicts between build-fixes and the reintegrate-improvements branch, do
> you want to bring reintegrate-improvements up-to-date with 1.5.x after I merge?
Will do
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985837
Re: 1.5.x currently doesn't build
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Paul Burba wrote:
> On Wed, Dec 17, 2008 at 10:06 AM, Hyrum K. Wright
> <hy...@mail.utexas.edu> wrote:
>> Julian Foad wrote:
>>> On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
>>>> 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.
>>> On 1.5.x-build-fixes I get:
>>>
>>> subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
>>> 'svn_mergeinfo__catalog_to_formatted_string'
>>> subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
>>> 'svn_mergeinfo__to_formatted_string'
>>>
>>> Those two functions appear to be redundant in the 1.5.x-build-fixes
>>> branch. That means in one sense that the warnings are harmless, but in
>>> another sense it's wrong to include them because they are not part of
>>> the fix. They were added to that branch as part of r34740 and then a
>>> further change r34741 was made to support them.
>>>
>>> Shouldn't we revert the bad merge straight away? All this proposing to
>>> fix it, and voting on the fix, while the branch is still broken, is
>>> getting in the way of reviewing further back-ports.
>> My preference (and the correct way to do it, IIUC) is to merge the reintegrate
>> improvements, which includes r34306 in its entirety, to 1.5.x. That branch is
>> still lacking a +1, so maybe we should focus review efforts there.
>
> Ok, if the reintegrate improvements are backported we can do that,
> making all of this moot. Assuming they are not, then we can revert
> the "bad" merge of r34385 and r34393 and then I can renominate those
> changes along with (the parts? of) r34306 that are required.
>
> The only real question is how long to wait to find out if the
> reintegrate improvements are going in or not. Is anyone looking at
> those right now?
Paul,
I'm in the midst of merging the build-fixes branch to 1.5.x (running tests now)
so 1.5.x will be back to a stable state for further review. Given that there
may be conflicts between build-fixes and the reintegrate-improvements branch, do
you want to bring reintegrate-improvements up-to-date with 1.5.x after I merge?
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985827
Re: 1.5.x currently doesn't build
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Dec 17, 2008 at 10:06 AM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> Julian Foad wrote:
>> On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
>>> 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.
>>
>> On 1.5.x-build-fixes I get:
>>
>> subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
>> 'svn_mergeinfo__catalog_to_formatted_string'
>> subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
>> 'svn_mergeinfo__to_formatted_string'
>>
>> Those two functions appear to be redundant in the 1.5.x-build-fixes
>> branch. That means in one sense that the warnings are harmless, but in
>> another sense it's wrong to include them because they are not part of
>> the fix. They were added to that branch as part of r34740 and then a
>> further change r34741 was made to support them.
>>
>> Shouldn't we revert the bad merge straight away? All this proposing to
>> fix it, and voting on the fix, while the branch is still broken, is
>> getting in the way of reviewing further back-ports.
>
> My preference (and the correct way to do it, IIUC) is to merge the reintegrate
> improvements, which includes r34306 in its entirety, to 1.5.x. That branch is
> still lacking a +1, so maybe we should focus review efforts there.
Ok, if the reintegrate improvements are backported we can do that,
making all of this moot. Assuming they are not, then we can revert
the "bad" merge of r34385 and r34393 and then I can renominate those
changes along with (the parts? of) r34306 that are required.
The only real question is how long to wait to find out if the
reintegrate improvements are going in or not. Is anyone looking at
those right now?
Paul
> We could
> revert the merge, but if we do that, we should also revert r34748, which fixed
> test failures introduced as a result of the merge (the ol' exit_code problem).
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985814
Re: 1.5.x currently doesn't build
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Julian Foad wrote:
> On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
>> 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.
>
> On 1.5.x-build-fixes I get:
>
> subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
> 'svn_mergeinfo__catalog_to_formatted_string'
> subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
> 'svn_mergeinfo__to_formatted_string'
>
> Those two functions appear to be redundant in the 1.5.x-build-fixes
> branch. That means in one sense that the warnings are harmless, but in
> another sense it's wrong to include them because they are not part of
> the fix. They were added to that branch as part of r34740 and then a
> further change r34741 was made to support them.
>
> Shouldn't we revert the bad merge straight away? All this proposing to
> fix it, and voting on the fix, while the branch is still broken, is
> getting in the way of reviewing further back-ports.
My preference (and the correct way to do it, IIUC) is to merge the reintegrate
improvements, which includes r34306 in its entirety, to 1.5.x. That branch is
still lacking a +1, so maybe we should focus review efforts there. We could
revert the merge, but if we do that, we should also revert r34748, which fixed
test failures introduced as a result of the merge (the ol' exit_code problem).
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985761
Re: 1.5.x currently doesn't build
Posted by Julian Foad <ju...@btopenworld.com>.
On Tue, 2008-12-16 at 13:50 -0600, Hyrum K. Wright wrote:
> 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.
On 1.5.x-build-fixes I get:
subversion/libsvn_subr/mergeinfo.c:1501: no previous prototype for
'svn_mergeinfo__catalog_to_formatted_string'
subversion/libsvn_subr/mergeinfo.c:1565: no previous prototype for
'svn_mergeinfo__to_formatted_string'
Those two functions appear to be redundant in the 1.5.x-build-fixes
branch. That means in one sense that the warnings are harmless, but in
another sense it's wrong to include them because they are not part of
the fix. They were added to that branch as part of r34740 and then a
further change r34741 was made to support them.
Shouldn't we revert the bad merge straight away? All this proposing to
fix it, and voting on the fix, while the branch is still broken, is
getting in the way of reviewing further back-ports.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985692