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

merge problem, svn: Directory 'xxx' is missing [Issue 2515]

From: Martin Hauner <Martin.Hauner_at_gmx.net>
Date: 2006-06-08 15:38:06 CEST

Hi,

I'm trying to merge a new and very big vendor drop (ace/tao) into our trunk
and I'm receiving an error "working copy 'orbsvc' is missing or not locked"
with svn 1.3.

Since we have deleted parts of ace/tao (like the dir given in the error) on
trunk (we don't need it and it saves a lot of space) this looks like issue 2515.

I have build an svn client from trunk and used the description from issue 2515
to see if it works on trunk. It does not.

I could spend a few hours fixing the problem but actually i have no idea how
to fix it.

The error is created in svn_wc_adm_retrieve. The interesting code seems to be
the add_directory in libsvn_client/repos_diff.c.

If anyone could outline a fix, I could try to create a patch.

> svn.exe!svn_wc_adm_retrieve(svn_wc_adm_access_t * *, svn_wc_adm_access_t *, const char *, apr_pool_t *) C
         svn.exe!get_path_access(svn_wc_adm_access_t * *, svn_wc_adm_access_t *, const char *, int, apr_pool_t *) C
         svn.exe!add_directory(const char *, void *, const char *, long, apr_pool_t *, void * *) C
         svn.exe!add_directory(const char *, void *, const char *, long, apr_pool_t *, void * *) C
         svn.exe!start_element(void *, int, const char *, const char *, const char * *) C
         svn.exe!start_element(void *, const char *, const char * *) C
         svn.exe!doContent(void *, int, const encoding *, const char *, const char *, const char * *) C
         svn.exe!contentProcessor(void *, const char *, const char *, const char * *) C
         svn.exe!doProlog(void *, const encoding *, const char *, const char *, int, const char *, const char * *) C
         svn.exe!prologProcessor(void *, const char *, const char *, const char * *) C
         svn.exe!prologInitProcessor(void *, const char *, const char *, const char * *) C
         svn.exe!XML_ParseBuffer(void *, int, int) C
         svn.exe!XML_Parse(void *, const char *, int, int) C
         svn.exe!ne_xml_parse(ne_xml_parser_s *, const char *, unsigned int) C
         svn.exe!parse_spool_file(const char *, ne_xml_parser_s *, apr_pool_t *) C
         svn.exe!parsed_request(ne_session_s *, const char *, const char *, const char *, apr_file_t *, void (ne_xml_parser_s *, void *)*, const svn_ra_dav__xml_elm_t *, int, int (void *, int, int)*, int (void *, const svn_ra_dav__xml_elm_t *, const char * *)*, int (void *, const svn_ra_dav__xml_elm_t *, const char *)*, int (void *, int, const char *, const char *, const char * *)*, int (void *, int, const char *, unsigned int)*, int (void *, int, const char *, const char *)*, void *, apr_hash_t *, int *, int, apr_pool_t *) C
         svn.exe!svn_ra_dav__parsed_request(ne_session_s *, const char *, const char *, const char *, apr_file_t *, void (ne_xml_parser_s *, void *)*, int (void *, int, const char *, const char *, const char * *)*, int (void *, int, const char *, unsigned int)*, int (void *, int, const char *, const char *)*, void *, apr_hash_t *, int *, int, apr_pool_t *) C
         svn.exe!reporter_finish_report(void *, apr_pool_t *) C
         svn.exe!do_merge(const char *, const char *, const svn_opt_revision_t *, const char *, const char *, const svn_opt_revision_t *, const svn_opt_revision_t *, const char *, svn_wc_adm_access_t *, int, int, int, const svn_wc_diff_callbacks2_t *, void *, svn_client_ctx_t *, apr_pool_t *) C
         svn.exe!svn_client_merge_peg2(const char *, const svn_opt_revision_t *, const svn_opt_revision_t *, const svn_opt_revision_t *, const char *, int, int, int, int, const apr_array_header_t *, svn_client_ctx_t *, apr_pool_t *) C
         svn.exe!svn_cl__merge(apr_getopt_t *, void *, apr_pool_t *) C
         svn.exe!main(int, const char * *) C
         svn.exe!__tmainCRTStartup() C
         svn.exe!mainCRTStartup() C

-- 
Martin
Subcommander, http://subcommander.tigris.org
a cross platform Win32/Unix/MacOSX subversion gui
client & diff/merge tool.
Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 8 15:41:18 2006

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