Hi, Erik and other devs!
Check attachement for my initial implementation of reverting props
after replace. For the time being it works only for repos-repos
copying. I dislike big patches, therefore I post it.
Also, I take liberties to improve some code to avoid duplications.
I have ugly modifed prop_path_internal, but didn't able invent anything better.
[[
Initial implementation of reverting props after replace.
* subversion/libsvn_wc/adm_files.c:
(prop_path_internal): Add parameter revert. Return revert prop
filename if revert==TRUE.
(svn_wc__prop_revert_path): New function that returns revert prop filename.
* subversion/libsvn_wc/adm_files.h:
(svn_wc__prop_revert_path): New function declaration.
* subversion/libsvn_wc/adm_ops.c:
(remove_revert_thing): New static helper for
svn_wc_process_committed2() that removes
revert file after commit.
(svn_wc_process_committed2): Remove prop revert file after commit.
(revert_admin_things): Use revert prop file as prop base for reverting.
* subversion/libsvn_wc/copy.c:
(copy_file_administratively): Move src_wprop, src_bprop, dst_wprop,
dst_bprop variables
to begin of function. Save prop base if we're replacing file.
* subversion/libsvn_wc/wc.h:
(SVN_WC__ADM_DIR_PROP_REVERT): New define for dir-prop revert filename.
* subversion/tests/clients/cmdline/revert_tests.py:
(test_list): Remove XFail mark from
revert_replace_with_history_with_props test.
]]
--
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 5 16:56:30 2005