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

[PATCH] replace adm_access batons in libsvn_client/patch.c

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 11 Sep 2009 10:00:38 +0200


Bert told me that I needed to open an adm_access baton before calling
svn_wc_delete4() or svn_wc_add4() and so I've done. I added a comment
saying that those batons can be removed at a later stage. Perhaps I
should use the ## notation that I've found in other part of the wc code?
I wasn't sure if they should only be used to discuss design descissions
so I did't use them.

The absolute paths is set in resolve_target_path(), hence I've removed
the call to svn_dirent_get_absolute() in svn_client_patch(). Perhaps a
follow-up patch can set the abspath only in svn_client_patch().

As part of WC-NG work, replace adm_access batons.

* subversion/libsvn_client/patch.c
  (init_patch_target): Replace adm_access parameter with path parameter.
    Call resolve_target_path() with path instead of accessing the path
    through the baton.
  (apply_one_patch): Remove adm_access parameter. Call
    init_patch_target() without adm_access. Replace call to
    svn_wc_add3() with svn_wc_add4(). Replace call to svn_wc_delete3()
    with svn_wc_delete4(). Open a write access baton before each call to
    the wc-functions. Currently this baton is retrieved internally by
  (apply_textdiffs): Remove adm_access parameter. Call apply_one_patch()
    without adm_access.
  (svn_client_patch): Do not open a adm_access baton. Call
    apply_textdiffs() without adm_access.

/Daniel Näslund

Sorry about the mime-type. Still problems with mutt and tigris.


Received on 2009-09-11 10:01:43 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.