On Thu, 7 Aug 2003 cmpilato@collab.net wrote:
> Shlomi Fish <shlomif@vipe.technion.ac.il> writes:
>
> > On Wed, 6 Aug 2003, Shlomi Fish wrote:
> >
> > > On Wed, 6 Aug 2003, Shlomi Fish wrote:
> > >
> > > >
> > > > As I suspected the patch still has the problem of not setting the file
> > > > permissions of the text-base,props and prop-base to read-only.
> > > >
> > > > I'll see how it can be fixed.
> > > >
> > >
> > > OK, an updated patch that fixes this problem is available here:
> > >
> > > http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev4.log.txt
> > >
> >
> > Sorry, wrong URL:
> >
> > http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev4.patch.txt
>
> Hey, Shlomi. I committed up the regression tests portion of this
> change in revision 6663, with the two tests XFail()ed. So if you
> still have these mods in your copy_tests.py and merge_tests.py, revert
> those two files before you next update. :-)
>
OK. The updated patch (without the tests) is here:
http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev4.patch.txt
And the log is:
<<<
Resolves Issue #1297 ('svn diff' after 'svn merge' that adds a file fails)
and other misbehaviours. (such as svn diff after a 'svn copy' of file).
* include/svn_wc.h
Added the declaration of svn_wc_put_repos_file_in_wc.
* libsvn_wc/update_editor.c
Added the svn_wc_put_repos_file_in_wc function that puts a file
in the working copy and set its text-base, props and prop-base.
* libsvn_client/copy.c
Added the function put_file_helper that serves as the callback to
put_repos_file_in_wc.
(repos_to_wc_copy): in the file case, replaced the broken logic with
a call to svn_wc_put_repos_file_in_wc. Also, removed setting the properties
, which is done by put_repos as it is.
>>>
> I haven't actually gotten around to reviewing the rest of the patch
> (though, I did notice a *really long* callback type name in there!).
>
What is your suggestion for a shorter callback type name?
Regards,
Shlomi Fish
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 7 20:22:05 2003