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

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

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-09-06 23:13:30 CEST

> > 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...)> It was a bug. Sorry.
np.
[snip] > I meant that patch fixes only part of replacements. Only repos-repos> copying. I'll adjust log message.
You mean wc->wc instead of repos->repos, I think?
> [[> Implementation of reverting props after repos to repos replacements.
[snip]> * subversion/libsvn_wc/adm_ops.c:> (remove_revert_thing): New static helper forCan we call this remove_revertfile ? I think that's more descriptive :-)
> * 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.
I didn't get to this part yet. > * 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.
Yup. and tests worked this time.
There is one bug, a few trailing spaces and 1 indenting problem I seein the patch. The bug is in remove_revert_thing:
====== if (kind == svn_node_file) { svn_xml_make_open_tag (logtags, pool, svn_xml_self_closing, SVN_WC__LOG_RM, SVN_WC__LOG_ATTR_NAME, revert_file, NULL); }======
I think the condition above should be
   if (kind == svn_node_file || is_prop)
since otherwise, you won't remove directory-property-revert-files.

I'll do more review tomorrow.

bye,

Erik.
Received on Tue Sep 6 23:14:19 2005

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