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

Re: svn commit: r26243 - in trunk/subversion: libsvn_client tests/cmdline

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-08-24 08:23:30 CEST

Dan,

Nothing to revert as the cause was r25341.

With regards
Kamesh Jayachandran
Daniel Rall wrote:
> Would you mind reverting until you've found a fix?
>
> Thanks!
>
> - Dan
>
> On Aug 23, 2007, at 4:49 AM, Kamesh Jayachandran wrote:
>
>> Thanks Lieven,
>>
>> I forgot to run 'make davautocheck'.
>>
>> The cause seems to be something else, which I am investigating.......
>>
>> It fails for do_single_file_merge of some revision of a file(which is
>> dead as of HEAD).
>>
>> I could see 'svn_client__get_repos_mergeinfo' inside
>> 'calculate_requested_ranges' failing.
>>
>> With regards
>> Kamesh Jayachandran
>>
>>
>> Lieven Govaerts wrote:
>>> Kamesh,
>>>
>>> this test still fails over ra_neon (hence breaking the Mac buildslave)
>>> and ra_serf.
>>>
>>> This is the test output from the Mac for ra_neon:
>>>
>>> CMD: svnadmin create svn-test-work/repositories/merge_tests-63
>>> --bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.485629>
>>> CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load
>>> "svn-test-work/repositories/merge_tests-63" <TIME = 0.096587>
>>> CMD: svn co --username jrandom --password rayjandom
>>> http://localhost:28733/svn-test-work/repositories/merge_tests-63
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.734855>
>>> CMD: svn ci --username jrandom --password rayjandom -m "log msg"
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.348193>
>>> CMD: svn status -v -u -q --username jrandom --password rayjandom
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.467347>
>>> CMD: svn cp
>>> http://localhost:28733/svn-test-work/repositories/merge_tests-63/A
>>> http://localhost:28733/svn-test-work/repositories/merge_tests-63/A_copy
>>> -m "create a new copy of A" --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.388318>
>>> CMD: svn up svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.268761>
>>> CMD: svn ci --username jrandom --password rayjandom -m "log msg"
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.351460>
>>> CMD: svn status -v -u -q --username jrandom --password rayjandom
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.471406>
>>> CMD: svn delete
>>> svn-test-work/working_copies/merge_tests-63/A/D/gamma --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.129744>
>>> CMD: svn ci --username jrandom --password rayjandom -m "log msg"
>>> svn-test-work/working_copies/merge_tests-63
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.349869>
>>> CMD: svn status -v -u -q --username jrandom --password rayjandom
>>> svn-test-work/working_copies/merge_tests-63 --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.374106>
>>> CMD: svn merge -r1:4
>>> http://localhost:28733/svn-test-work/repositories/merge_tests-63/A/D/gamma@4
>>> svn-test-work/working_copies/merge_tests-63/A_copy/D/gamma
>>> --config-dir
>>> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
>>> <TIME = 0.566627>
>>> EXPECTED STDERR:
>>> ACTUAL STDERR:
>>> subversion/libsvn_ra_neon/util.c:1279: (apr_err=175007)
>>> svn: REPORT request failed on
>>> 'http://localhost:28733/svn-test-work/repositories/merge_tests-63/A/D/gamma'
>>>
>>> subversion/libsvn_ra_neon/util.c:543: (apr_err=175007)
>>> svn:
>>> 'http://localhost:28733/svn-test-work/repositories/merge_tests-63/A/D/gamma'
>>> path not found
>>> EXCEPTION: SVNLineUnequal
>>> FAIL: merge_tests.py 63: merge fails if subtree is deleted on src
>>> END: merge_tests.py
>>>
>>>
>>> I temporarely marked the test as XFail-ing over http in r26262.
>>>
>>> Lieven
>>>
>>> kameshj@tigris.org wrote:
>>>
>>>> Author: kameshj
>>>> Date: Wed Aug 22 02:21:51 2007
>>>> New Revision: 26243
>>>>
>>>> Log:
>>>> Fix issue 2876 - "Merge on parent having subtree with differing
>>>> mergeinfo which is getting deleted by the current merge fails".
>>>>
>>>> * subversion/libsvn_client/merge.c
>>>> (elide_children, do_merge):
>>>> No need to do anything on a children_with_mergeinfo's item
>>>> that is set to NULL.
>>>> (struct get_diff_summary_baton):
>>>> New baton passed to 'svn_client_diff_summarize_func_t' callback.
>>>> (get_diff_summary_func_cb):
>>>> New diff summarize callback interface.
>>>> (discover_and_merge_children):
>>>> Summarize the merge. If any path is found to be deleted remove
>>>> it from '*children_with_mergeinfo' and continue with next
>>>> subtree without doing any merge on this to be deleted subtree.
>>>>
>>>> * subversion/tests/cmdline/merge_tests.py
>>>> (merge_fails_if_subtree_is_deleted_on_src): Fix the testcase.
>>>> Force the merge so that 'locally modified file' won't get
>>>> skipped upon deletion by merge.
>>>> (test_list): remove XFail marker on
>>>> 'merge_fails_if_subtree_is_deleted_on_src'
>>>>
>>>> [..]
>>>>
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 24 08:19:29 2007

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