Re: [PATCH] wc-replacements branch: Initial implementation of reverting props after replace

Hi Ivan!

> 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.

I needed to study the code to figure out what you patch was doing, so I
didn't finish review today. I like what I saw though. I assume you ran
tests and noticed not all of them passing? (At least they didn't on my
system...)
 
> [[
> Initial implementation of reverting props after replace.

If I am to commit this as a step towards prop-reverting with replacement,
maybe you can state that it is partial, what it breaks and what you intend
to do about it? Just so that if others see the branch, they can find out
about its state from the logs.

> * subversion/libsvn_wc/adm_files.c:
> (prop_path_internal): Add parameter revert. Return revert prop
> filename if revert==TRUE.

base, revert and wcprop have been assigned overlapping meanings, right: it's
either base, revert or wcprop that can be TRUE, not all of them at once. If
that's correct, then wouldn't an enum type make more sense?

> (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.

The adm_ops.c review has been scheduled for later this week (tomorrow?), but
from what you describe, I see that its behaviour is similar to the
revert-file behaviour for text-bases. (Which is a good thing.)

>
> * 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.

The following is the output from merge_tests.py (on the branch):

FAIL: merge_tests.py 1: performing a merge, with mixed results
FAIL: merge_tests.py 4: some simple property merges
FAIL: merge_tests.py 11: merge one file (issue #1150)
FAIL: merge_tests.py 22: property merges don't overwrite existing prop-mods
FAIL: merge_tests.py 23: property merge conflict even without local mods

Is that expected?

bye,

Erik.

-- 
GMX DSL = Maximale Leistung zum minimalen Preis!
2000 MB nur 2,99, Flatrate ab 4,99 Euro/Monat: http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org