Login | Register
My pages Projects Community openCollabNet

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

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

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

Author "Paul Burba" <ptburba at gmail dot com>
Full name "Paul Burba" <ptburba at gmail dot com>
Date 2008-12-18 06:42:30 PST
Message On Thu, Dec 18, 2008 at 8:59 AM, Julian Foad <julianfoad@btope​nworld.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.ne​t/repos/svn/branches​/1.5.x
>> Repository Root: http://svn.collab.net/repos/svn
>> Repository UUID: 612f8ebc-c883-4be0-9​ee0-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.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements .
>> --- Merging differences between repository URLs into '.':
>> U STATUS
>> G www\images\subvers​ion-diagram.png
>> G www\images\subvers​ion_logo-200x173.png​
>> G www\images\subvers​ion_logo_hor-468x64.​png
>> G www\images\subvers​ion_logo-384x332.png​
>> G COMMITTERS
>> G notes\tree-conflict​s\scratch-pad.txt
>> U subversion\libsvn_f​s_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_mergei​nfo_private.h
>> G subversion\include\private
>> UG subversion\libsvn_wc\adm_ops.c
>> U subversion\libsvn_s​ubr\mergeinfo.c
>> G subversion\libsvn_subr
>> Conflict discovered in 'subversion/libsvn_c​lient/merge.c'.
>> Select: (p) postpone, (df) diff-full, (e) edit,
>> (mc) mine-conflict, (tc) theirs-conflict,
>> (s) show all options: p
>> CG subversion\libsvn_c​lient\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\c​mdline\revert_tests​.py
>> U subversion\tests\c​mdline\copy_tests.p​y
>> U subversion\tests\c​mdline\update_tests​.py
>> UG subversion\tests\c​mdline\svntest\act​ions.py
>> U subversion\tests\c​mdline\merge_tests.​py
>> U subversion\libsvn_r​a_svn\cyrus_auth.c
>> U subversion\libsvn_r​a_svn\internal_auth​.c
>> U subversion\libsvn_r​a_svn\ra_svn.h
>> G CHANGES
>> G .
>> Summary of conflicts:
>> Text conflicts: 1
>>
>> The conflict was on the whole file:
>>
>> >svn diff subversion\libsvn_c​lient\merge.c
>> Index: subversion/libsvn_cl​ient/merge.c
>> ====================​====================​====================​=======
>> --- subversion/libsvn_cl​ient/merge.c (revision 34802)
>> +++ subversion/libsvn_cl​ient/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.ne​t/repos/svn/branches​/1.5.x
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9​ee0-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-i​mprovements@34802 .
> --- Merging differences between repository URLs into '.':
> G www/images/subversio​n-diagram.png
> G www/images/subversio​n_logo-200x173.png
> G www/images/subversio​n_logo_hor-468x64.pn​g
> G www/images/subversio​n_logo-384x332.png
> G COMMITTERS
> G notes/tree-conflicts​/scratch-pad.txt
> U subversion/include/p​rivate/svn_mergeinfo​_private.h
> G subversion/include/private
> G subversion/libsvn_wc/adm_ops.c
> U subversion/libsvn_su​br/mergeinfo.c
> G subversion/libsvn_subr
> UG subversion/libsvn_cl​ient/merge.c
> G subversion/bindings/swig
> G subversion/tests/cmd​line/svntest/actions​.py
> U subversion/tests/cmd​line/merge_tests.py
> G CHANGES
> G .
>
> $ svn-1.5.4 merge --reintegrate $SVN_REPOS/branches​/1.5.x-reintegrate-i​mprovements .
> svn: Cannot reintegrate from 'http://svn.collab.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements' 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-i​mprovements/@34802 .
> /home/julianfoad/src​/subversion-grey/sub​version/libsvn_ra_ne​on/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-i​mprovements/subversi​on/libsvn_client/mer​ge.c subversion/libsvn_cl​ient/merge.c
> --- Merging differences between repository URLs into 'subversion/libsvn_c​lient/merge.c':
> UG subversion/libsvn_cl​ient/merge.c
>
> $ svn-trunk merge --reintegrate $SVN_REPOS/branches​/1.5.x-reintegrate-i​mprovements .
> /home/julianfoad/src​/subversion-trunk/su​bversion/libsvn_ra_n​eon/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-i​mprovements/subversi​on/libsvn_client@348​02 subversion/libsvn_client
> /home/julianfoad/src​/subversion-red/subv​ersion/libsvn_client​/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements/subversi​on/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-i​mprovements@34802 .
> /home/julianfoad/src​/subversion-red/subv​ersion/libsvn_client​/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements' 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-i​mprovements .
> /home/julianfoad/src​/subversion-red/subv​ersion/libsvn_client​/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements' 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-i​mprovements/subversi​on/libsvn_client subversion/libsvn_client
> /home/julianfoad/src​/subversion-red/subv​ersion/libsvn_client​/merge.c:6723: (apr_err=195016)
> svn: Cannot reintegrate from 'http://svn.collab.ne​t/repos/svn/branches​/1.5.x-reintegrate-i​mprovements/subversi​on/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-rein​tegrate-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

« Previous message in topic | 9 of 14 | Next message in topic »

Messages

Show all messages in topic

1.5.x currently doesn't build "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-16 11:50:35 PST
     Re: 1.5.x currently doesn't build julianfoad Julian Foad 2008-12-17 05:30:52 PST
         Re: 1.5.x currently doesn't build "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-17 07:06:50 PST
             Re: 1.5.x currently doesn't build "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2008-12-17 07:49:44 PST
                 Re: 1.5.x currently doesn't build "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-17 08:00:43 PST
                     Re: 1.5.x currently doesn't build "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2008-12-17 08:06:02 PST
                         Re: 1.5.x currently doesn't build "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2008-12-17 15:03:44 PST
                             Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] julianfoad Julian Foad 2008-12-18 05:54:49 PST
                                 Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2008-12-18 06:42:30 PST
                                 Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] cmpilato C. Michael Pilato 2008-12-18 07:24:47 PST
                                     Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] cmpilato C. Michael Pilato 2008-12-22 06:35:46 PST
                                 Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] "Paul Burba" <ptburba at gmail dot com> "Paul Burba" <ptburba at gmail dot com> 2008-12-18 08:10:59 PST
                                     Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] markphip Mark Phippard 2008-12-18 08:26:44 PST
                                     Re: Problems merging the reintegrate-improvements branch [was: 1.5.x currently doesn't build] julianfoad Julian Foad 2008-12-18 11:05:03 PST
Messages per page: