You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Timothee Besset <tt...@idsoftware.com> on 2002/11/24 14:13:21 UTC
svn merge 0.15 and trunk segfaults
As a follow up to my mail regarding vendor branches and merging, current
0.15 client / trunk client is segfaulting on me (against a 0.15 server).
It crashed on the initial merge command, crashes again if I re-issue (the
G in the log is because this output is from my second attempt):
<..>/main$ svn merge -r4:8 <..>/branches/sync
timo's password:
G neo/todo.txt
<..>
G neo/framework/Session.cpp
Segmentation fault
Didn't find anything like this in the issues. Reporting info below. Let me
know if I should push this into the issues, provide more info etc. I think
the crash is related to the fact that my vendor branch (/branches/sync)
has had a neo/unixOutput directory added. The vendor branch /branches/sync
is what I'm trying to merge into trunk.
Then I built current trunk and tried again, got the same backtrace as
below (below is the 0.15 bt). Both clients built from source (not using
Debian svn packages anymore, too outdated)
I manually added neo/unixOutput in my main directory, then issues the svn
merge command again. All went fine this time. (well except it crashed on
other created dirs, but you see the point)
TTimo
=-=-=-=-=-=-=-=-=
(gdb) bt
#0 svn_io_check_path (path=0x0, kind=0xbffff0e4, pool=0x8279c60) at subversion/libsvn_subr/io.c:64
#1 0x40035d49 in svn_wc_check_wc (path=0x0, wc_format=0xbffff124, pool=0x8279c60) at subversion/libsvn_wc/questions.c:53
#2 0x40015d59 in store_auth_info (filename=0x4001fc6b "username", data=0x81de470 "timo", cb=0x8279ea8) at subversion/libsvn_client/auth.c:239
#3 0x40015e33 in maybe_store_username (username=0x81de470 "timo", baton=0x8279ea8) at subversion/libsvn_client/auth.c:278
#4 0x40015f05 in store_user_and_pass (baton=0x8279ea8) at subversion/libsvn_client/auth.c:316
#5 0x400542e3 in svn_ra_dav__maybe_store_auth_info (ras=0x827a068) at subversion/libsvn_ra_dav/util.c:353
#6 0x4004fee4 in svn_ra_dav__do_checkout (session_baton=0x827a068, revision=8, recurse=1, editor=0x826be80, edit_baton=0x826beb8) at subversion/libsvn_ra_dav/fetch.c:1181
#7 0x40019ade in repos_to_wc_copy (src_url=0x8279d40 "https:<..>/neo/unixOutput", src_revision=0xbffff9f0, dst_path=0x8211820 "neo/unixOutput", optional_adm_access=0x805c4b0, auth_baton=0x805bb48, notify_func=0, notify_baton=0x0, pool=0x8279c60) at subversion/libsvn_client/copy.c:779
#8 0x40019f91 in setup_copy (commit_info=0x0, src_path=0x8279d40 "https:<..>/neo/unixOutput", src_revision=0xbffff9f0, dst_path=0x8211820 "neo/unixOutput", optional_adm_access=0x805c4b0, auth_baton=0x805bb48, log_msg_func=0, log_msg_baton=0x0, is_move=0, force=1, notify_func=0, notify_baton=0x0, pool=0x8279c60) at subversion/libsvn_client/copy.c:1011
#9 0x4001a008 in svn_client_copy (commit_info=0x0, src_path=0x8279d40 "https:<..>/neo/unixOutput", src_revision=0xbffff9f0, dst_path=0x8211820 "neo/unixOutput", optional_adm_access=0x805c4b0, auth_baton=0x805bb48, log_msg_func=0, log_msg_baton=0x0, notify_func=0, notify_baton=0x0, pool=0x8279c60) at subversion/libsvn_client/copy.c:1046
#10 0x4001add8 in merge_dir_added (adm_access=0x805c4b0, path=0x8211820 "neo/unixOutput", baton=0xbffff7cc) at subversion/libsvn_client/diff.c:524
#11 0x4001e642 in add_directory (path=0x82117e0 "neo/unixOutput", parent_baton=0x81ff018, copyfrom_path=0x0, copyfrom_revision=-1, pool=0x82116f0, child_baton=0xbffff464) at subversion/libsvn_client/repos_diff.c:530
#12 0x40050b9f in start_element (userdata=0x81d3e38, elm=0x400572e4, atts=0x81e3458) at subversion/libsvn_ra_dav/fetch.c:1768
#13 0x401d4ad0 in start_element (userdata=0x81c1490, name=0x81e97e0 "S:add-directory", atts=0x81e3458) at ne_xml.c:418
#14 0x402f0f35 in xmlParseStartTag () from /usr/lib/libxml2.so.2
#15 0x402f3f27 in xmlParseExtParsedEnt () from /usr/lib/libxml2.so.2
#16 0x402f49bd in xmlParseChunk () from /usr/lib/libxml2.so.2
#17 0x401d543d in ne_xml_parse (p=0x81c1490, block=0x81e0408 "<S:fetch-file/>\n<S:prop><D:version-name>8</D:version-name><D:creationdate>2002-11-23T18:05:54.032780Z</D:creationdate><D:creator-displayname>timo</D:creator-displayname></S:prop>\n</S:open-file>\n<S:pro"..., len=7994) at ne_xml.c:815
#18 0x401d53a8 in ne_xml_parse_v (userdata=0x81c1490, block=0x81e0408 "<S:fetch-file/>\n<S:prop><D:version-name>8</D:version-name><D:creationdate>2002-11-23T18:05:54.032780Z</D:creationdate><D:creator-displayname>timo</D:creator-displayname></S:prop>\n</S:open-file>\n<S:pro"..., len=7994) at ne_xml.c:780
#19 0x401d3bf6 in gz_reader (ud=0x81e5478, buf=0x81e0408 "<S:fetch-file/>\n<S:prop><D:version-name>8</D:version-name><D:creationdate>2002-11-23T18:05:54.032780Z</D:creationdate><D:creator-displayname>timo</D:creator-displayname></S:prop>\n</S:open-file>\n<S:pro"..., len=7994) at ne_compress.c:267
#20 0x401ca804 in ne_read_response_block (req=0x81e03e0, buffer=0x81e0408 "<S:fetch-file/>\n<S:prop><D:version-name>8</D:version-name><D:creationdate>2002-11-23T18:05:54.032780Z</D:creationdate><D:creator-displayname>timo</D:creator-displayname></S:prop>\n</S:open-file>\n<S:pro"..., buflen=8192) at ne_request.c:814
#21 0x401cb4b2 in ne_request_dispatch (req=0x81e03e0) at ne_request.c:1253
#22 0x40054141 in svn_ra_dav__parsed_request (ras=0x81d3ba8, method=0x40054ed1 "REPORT", url=0x80b79e8 "<..>/branches/sync", body=0x0, fd=3, elements=0x40057284, validate_cb=0x400505a8 <validate_element>, startelm_cb=0x4005081c <start_element>, endelm_cb=0x4005102c <end_element>, baton=0x81d3e38, pool=0x805b760) at subversion/libsvn_ra_dav/util.c:270
#23 0x400517b0 in reporter_finish_report (report_baton=0x81d3e38) at subversion/libsvn_ra_dav/fetch.c:2246
#24 0x4001b1ef in do_merge (notify_func=0x804b570 <notify>, notify_baton=0x805bc58, auth_baton=0x805bb48, URL1=0x805bbd8 "https://<..>/branches/sync", revision1=0xbffff9e4, URL2=0x805bbd8 "https://<..>/branches/sync", revision2=0xbffff9f0, target_wcpath=0x805570c "", adm_access=0x805be18, recurse=1, dry_run=0, callbacks=0x40022850, callback_baton=0xbffff7cc, pool=0x805b760) at subversion/libsvn_client/diff.c:762
#25 0x4001bf26 in svn_client_merge (notify_func=0x804b570 <notify>, notify_baton=0x805bc58, auth_baton=0x805bb48, URL1=0x805bbd8 "https://<..>/branches/sync", revision1=0xbffff9e4, URL2=0x805bbd8 "https://<..>/branches/sync", revision2=0xbffff9f0, target_wcpath=0x805570c "", recurse=1, force=0, dry_run=0, pool=0x805b760) at subversion/libsvn_client/diff.c:1357
#26 0x0804d4d2 in svn_cl__merge (os=0x805b8c0, baton=0xbffff9e4, pool=0x805b760) at subversion/clients/cmdline/merge-cmd.c:153
#27 0x0804d186 in main (argc=4, argv=0xbffffab4) at subversion/clients/cmdline/main.c:825
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge 0.15 and trunk segfaults
Posted by Timothee Besset <tt...@idsoftware.com>.
So, didn't get any follow up. Should I file this as an issue?
TTimo
On Sun, 24 Nov 2002 15:25:44 +0100
Timothee Besset <tt...@idsoftware.com> wrote:
> Good catch. If I use --no-auth-cache then it runs fine.
>
> TTimo
>
> On 24 Nov 2002 14:17:25 +0000
> Philip Martin <ph...@codematters.co.uk> wrote:
>
> > Timothee Besset <tt...@idsoftware.com> writes:
> >
> > > As a follow up to my mail regarding vendor branches and merging, current
> > > 0.15 client / trunk client is segfaulting on me (against a 0.15 server).
> > > It crashed on the initial merge command, crashes again if I re-issue (the
> > > G in the log is because this output is from my second attempt):
> > >
> > > <..>/main$ svn merge -r4:8 <..>/branches/sync
> > > timo's password:
> > >
> > > G neo/todo.txt
> > > <..>
> > > G neo/framework/Session.cpp
> > > Segmentation fault
> >
> > It's probably a bug in the auth-caching code. Does the command work if
> > you pass --no-auth-cache?
> >
> > --
> > Philip Martin
> >
> > ---------------------------------------------------------------------
> > 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
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge 0.15 and trunk segfaults
Posted by Timothee Besset <tt...@idsoftware.com>.
Good catch. If I use --no-auth-cache then it runs fine.
TTimo
On 24 Nov 2002 14:17:25 +0000
Philip Martin <ph...@codematters.co.uk> wrote:
> Timothee Besset <tt...@idsoftware.com> writes:
>
> > As a follow up to my mail regarding vendor branches and merging, current
> > 0.15 client / trunk client is segfaulting on me (against a 0.15 server).
> > It crashed on the initial merge command, crashes again if I re-issue (the
> > G in the log is because this output is from my second attempt):
> >
> > <..>/main$ svn merge -r4:8 <..>/branches/sync
> > timo's password:
> >
> > G neo/todo.txt
> > <..>
> > G neo/framework/Session.cpp
> > Segmentation fault
>
> It's probably a bug in the auth-caching code. Does the command work if
> you pass --no-auth-cache?
>
> --
> Philip Martin
>
> ---------------------------------------------------------------------
> 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
Re: svn merge 0.15 and trunk segfaults
Posted by Philip Martin <ph...@codematters.co.uk>.
Timothee Besset <tt...@idsoftware.com> writes:
> As a follow up to my mail regarding vendor branches and merging, current
> 0.15 client / trunk client is segfaulting on me (against a 0.15 server).
> It crashed on the initial merge command, crashes again if I re-issue (the
> G in the log is because this output is from my second attempt):
>
> <..>/main$ svn merge -r4:8 <..>/branches/sync
> timo's password:
>
> G neo/todo.txt
> <..>
> G neo/framework/Session.cpp
> Segmentation fault
It's probably a bug in the auth-caching code. Does the command work if
you pass --no-auth-cache?
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org