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

Re: svn commit: r31326 - in branches/tree-conflicts/subversion: libsvn_client tests/cmdline tests/cmdline/svntest

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Wed, 21 May 2008 16:28:42 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> -
> + merge_cmd_baton_t *merge_b = baton;
> + apr_pool_t *subpool = svn_pool_create(merge_b->pool);
> + svn_node_kind_t kind;
> + const svn_wc_entry_t *entry;
> +
> + /* Find the version-control and on-disk states of this path */
> + SVN_ERR(svn_wc_entry(&entry, path, adm_access, TRUE, subpool));
> + SVN_ERR(svn_io_check_path(path, &kind, subpool));
> +
> + /* If we're trying to open a directory that's not a directory,
> + * raise a tree conflict. */
> + if (!entry || entry->schedule == svn_wc_schedule_delete
> + || kind != svn_node_dir)
> + {
> + SVN_ERR(tree_conflict(merge_b, adm_access, path,
> + svn_node_dir,
> + svn_wc_conflict_action_edit,
> + svn_wc_conflict_reason_deleted));
> + }
> +

Hope you would have thought about destroying the above subpool here.

> return SVN_NO_ERROR;
> }

With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFINABh3WHvyO0YTCwRAiLBAKC19e//zHB0DS5PQK4FAmlV3olVQgCeLo/p
OgyYXr+S6UIQCvD9HPRqWHc=
=LnoT
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-21 12:59:42 CEST

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