On 10/14/05, dionisos@tigris.org <dionisos@tigris.org> wrote:
> Author: dionisos
> Date: Thu Oct 13 15:57:31 2005
> New Revision: 16701
>
> Modified:
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/copy.c
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_wc/adm_files.c
> trunk/subversion/libsvn_wc/adm_files.h
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/copy.c
> trunk/subversion/libsvn_wc/entries.c
> trunk/subversion/libsvn_wc/log.c
> trunk/subversion/libsvn_wc/log.h
> trunk/subversion/libsvn_wc/props.c
> trunk/subversion/libsvn_wc/props.h
> trunk/subversion/libsvn_wc/translate.c
> trunk/subversion/libsvn_wc/update_editor.c
> trunk/subversion/libsvn_wc/wc.h
> trunk/subversion/tests/clients/cmdline/copy_tests.py
> trunk/subversion/tests/clients/cmdline/merge_tests.py
> trunk/subversion/tests/clients/cmdline/revert_tests.py
>
> Log:
> Merge wc-replacements branch.
>
>
> Branch activity summary:
> - Enable replacements of files by storing 2 text-bases for replaced files
> - Enable replacements of files and dirs by storing 2 prop-bases for
> replaced items
> - Make repos->wc copies and merge replacements work
> - Make the above work when the item has properties
> - Make sure multiple replacements don't bork the revert-base
> - Mark 'svn rm --force' deleted replacements as 'D'eleted again
> - Make sure WC sanity is maintained by using logs to manipulate state
>
>
> - Add and update tests to test the new functionality
Wow! We did it! Thanks Erik!
--
Ivan Zhakov
Received on Fri Oct 14 15:47:50 2005