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

Re: Interactive Conflict Resolution -- Choose Base Revision

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-15 16:57:39 CEST

The error is happening because svn_wc__merge_internal() is trying to
loggily copy "/tmp/blah" to ".svn/blah". This violates the sandbox of
loggy operations -- they're only allowed to work strictly within the
immediate WC directory.

The question, then, is: why is svn_wc__merge_internal() being invoked
with a "left" argument of /tmp/blah, rather than .svn/tmp/blah?

On 10/15/07, Mark Phippard <markphip@gmail.com> wrote:
> Perhaps this is not a problem as when I do this from the command line,
> I do not have an option to choose the "base" revision (at least when
> running merge). Anyway, the choices that are available in the struct
> exposed to JavaHL does include a chooseBase option. If you select
> that option (at least during merge) then you get a crash. Here is the
> info from the crash log.
>
> Is chooseBase only supposed to be valid during update/switch?
>
>
> 0 libsvn_subr-1.0.dylib 0x39acbdf9 svn_path_join + 66
> 1 libsvn_wc-1.0.dylib 0x398adaa3 loggy_move_copy_internal + 47
> 2 libsvn_wc-1.0.dylib 0x398addf9 svn_wc__loggy_copy + 131
> 3 libsvn_wc-1.0.dylib 0x398b007d svn_wc__merge_internal + 1906
> 4 libsvn_wc-1.0.dylib 0x398b0de8 svn_wc_merge3 + 152
> 5 libsvn_client-1.0.dylib 0x39b5fd7e merge_file_changed + 981
> 6 libsvn_client-1.0.dylib 0x39b6ea1a close_file + 799
> 7 libsvn_delta-1.0.dylib 0x394f1990 close_file + 87
> 8 libsvn_delta-1.0.dylib 0x394f1990 close_file + 87
> 9 libsvn_repos-1.0.dylib 0x394bb6a3 update_entry + 1980
> 10 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 11 libsvn_repos-1.0.dylib 0x394bb400 update_entry + 1305
> 12 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 13 libsvn_repos-1.0.dylib 0x394bb400 update_entry + 1305
> 14 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 15 libsvn_repos-1.0.dylib 0x394bb400 update_entry + 1305
> 16 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 17 libsvn_repos-1.0.dylib 0x394bb400 update_entry + 1305
> 18 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 19 libsvn_repos-1.0.dylib 0x394bb400 update_entry + 1305
> 20 libsvn_repos-1.0.dylib 0x394bbe63 delta_dirs + 1962
> 21 libsvn_repos-1.0.dylib 0x394bc244 drive + 911
> 22 libsvn_repos-1.0.dylib 0x394bc653 finish_report + 774
> 23 libsvn_repos-1.0.dylib 0x394bcacc svn_repos_finish_report + 30
> 24 libsvn_ra_local-1.0.dylib 0x384a4962 reporter_finish_report + 33
> 25 libsvn_client-1.0.dylib 0x39b62445 drive_merge_report_editor + 973
> 26 libsvn_client-1.0.dylib 0x39b63356 do_merge + 412
> 27 libsvn_client-1.0.dylib 0x39b65a6f discover_and_merge_children + 1050
> 28 libsvn_client-1.0.dylib 0x39b6772a svn_client_merge_peg3 + 2906
> 29 libsvnjavahl-1.0.dylib 0x3961b02d SVNClient::merge(char
> const*, Revision&, std::vector<RevisionRange,
> std::allocator<RevisionRange> >&, char const*, bool, svn_depth_t,
> bool, bool) + 645 (SVNClient.cpp:682)
> 30 libsvnjavahl-1.0.dylib 0x39625e5a
> Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2_3Lorg_tigris_subversion_javahl_RevisionRange_2Ljava_lang_String_2ZIZZ
> + 808 (org_tigris_subversion_javahl_SVNClient.cpp:847)
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ---------------------------------------------------------------------
> 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 Mon Oct 15 16:57:51 2007

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