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

Don't leave svn_wc_text_modified_p2 in public API

From: Ivan Zhakov <chemodax_at_gmail.com>
Date: 2006-04-07 14:11:20 CEST

Hi!
After 1.3.x in r17339 Erik Huelsman deprecated svn_wc_text_modified_p
and replaced it with svn_wc_text_modified_p2 which has new parameter
compare_textbases. svn_wc_text_modified_p calls
svn_wc_text_modified_p2 with compare_textbases==TRUE.
See the log message:
------------------------------------------------------------------------
r17339 | dionisos | 2005-11-14 23:49:45 +0300 (Mon, 14 Nov 2005) | 28 lines

Fix issue #1663 (reverting file with locally modified keywords doesn't revert).

* subversion/include/svn_wc.h
* subversion/libsvn_wc/questions.h
* subversion/libsvn_wc/questions.c
  (svn_wc_text_modified_p2): New. Extend svn_wc_text_modified_p with
  the possibility to compare 'working copy form' files.
  (svn_wc__versioned_file_modcheck,
   compare_and_verify): Extend with the above comparison.
  (svn_wc_text_modified_p): Deprecate.

* subversion/libsvn_wc/questions.c
  (translate_from_normal_form): New. Helper for
  svn_wc__versioned_file_modcheck and verify_and_compare to create
  a 'working copy form' temporary file.

* subversion/tests/clients/cmdline/revert_tests.py
  (test_list): Unmark revert_reexpand_keyword XFAIL.

* subversion/libsvn_wc/diff.c
* subversion/libsvn_wc/log.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/status.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_client/commit_util.c
  Update callers to svn_wc_text_modified_p2.

------------------------------------------------------------------------

But we use svn_wc_text_modified_p2 with compare_textbases==FALSE only
in one place and it is inside libsvn_wc.
So, I propose don't leave svn_wc_text_modified_p2 in our public API.

BTW: Other argue is that svn_wc_text_modified_p2 cannot be implemented
with compare_textbases==FALSE for special files.

--
Ivan Zhakov
Received on Fri Apr 7 14:11:54 2006

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.