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

On 9/7/05, Ivan Zhakov <chemodax@gmail.com> wrote:> On 9/7/05, Erik Huelsmann <ehuels@gmail.com> wrote:> > > 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?> Yes, of course wc->wc copies. Sorry.> > > > [[> > > Implementation of reverting props after repos to repos replacements.> >> > [snip]> >> * subversion/libsvn_wc/adm_ops.c:> >> (remove_revert_thing): New static helper for> > Can we call this remove_revertfile ? I think that's more descriptive :-)> Ok. I'll fix this.> > [snip]> > There is one bug, a few trailing spaces and 1 indenting problem I see> > in 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 don't understand why this condition should include is_prop? In this> condition I check that revert file exists. It's necessary remove file> if it doesn't exists.
Yes, you're right. I read over it. Sorry.
In that case, I think the patch is correct and nicely cleans upprop_path_internal().
I'll look into committing tonight.
bye,

Erik.
PS: Our messages crossed: I was writing mine to you when yours to memust have entered my gmail box. I found it immediately after I sentmine.
Received on Wed Sep 7 11:44:37 2005