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

Re: svn commit: rev 1582 - trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_client

From: <cmpilato_at_collab.net>
Date: 2002-03-27 00:16:46 CET

Greg Stein <gstein@lyra.org> writes:

> On Fri, Mar 22, 2002 at 10:37:21AM -0600, cmpilato@tigris.org wrote:
> >...
> > +svn_wc_transmit_text_deltas (svn_stringbuf_t *path,
> > + svn_wc_entry_t *entry,
> > + const svn_delta_editor_t *editor,
> > + void *file_baton,
> > + apr_pool_t *pool)
> > +{
> >...
> > + SVN_ERR (svn_wc_translated_file (&tmpf, path, pool));
> > + tmp_base = svn_wc__text_base_path (path, TRUE, pool);
> > + SVN_ERR (svn_io_copy_file (tmpf->data, tmp_base->data, FALSE, pool));
> > + if (tmpf != path)
> > + SVN_ERR (svn_io_remove_file (tmpf->data, pool));
> > +
> > + /* Open a filehandle for tmp local file, and one for text-base if
> > + applicable. */
> > + if ((status = apr_file_open (&localfile, tmpf->data,
> > + APR_READ, APR_OS_DEFAULT, pool)))
>
> You removed tmpf->data further above. This should be tmp_base->data.
>
> This happened to work because the translation did nothing, so tmpf==path in
> your case. It would fail on files with keywords or newline translation.
>
> > + return svn_error_createf (status, 0, NULL, pool,
> > + "do_apply_textdelta: error opening '%s'",
> > + tmpf->data);
>
> Same.

Thanks for catching that.

> >...
> > +++ trunk/subversion/libsvn_client/commit_util.c Fri Mar 22 10:37:19 2002
> >...
> > + /* Transmit outstanding text deltas. */
> > + for (i = 0; i < file_mods->nelts; i++)
> > + {
> > + struct file_mod_t *mod
> > + = ((struct file_mod_t *) file_mods->elts) + i;
> > + svn_client_commit_item_t *item = mod->item;
> > + void *file_baton = mod->file_baton;
> > +
> > + printf (" Sending : %s\n", item->url->data);
> > + SVN_ERR (svn_wc_transmit_text_deltas
> > + (item->path, item->entry, editor, file_baton, pool));
>
> That printf() is temporary, right? Until you can compose th track editor?

Yep. Though if all goes well, there will be no track editor (you
meant "trace" perhaps?)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 27 00:17:18 2002

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