On 9/10/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 9/9/07, Mark Phippard <markphip@gmail.com> wrote:
>
> > Kamesh is still working on the new merge algorithm (2821) proposed by
> > Peter Lundblad earlier this year.
>
> Wow, Kamesh is a super-hero! :-)
>
> > Ben merged his copy-on-update branch to trunk. I am still trying to
> > sort out what that means exactly.
>
> It means that svn 1.5 clients can now request that copyfrom-args be
> sent during updates, and 1.5 servers can oblige the request. What I'm
> now working on is making libsvn_wc actually *use* this new update
> information intelligently. At the moment, the update-editor just
> stupidly does an RA side-fetch of the copyfrom-path. Instead, the
> client code needs to try and locate the (possibly edited) file already
> in the wc. Stay tuned.
>
>
> > Dan reported an issue on IRC that it looks like he did not enter. He
> > could not commit a changelist because a file not in the changelist had
> > conflicts.
>
> Doh, that sounds like a stupid bug just begging for a test-case!
>
>
>
> >
> > One we might need to push to a new release if no one steps forward:
> >
> > 2238: svn propset/del/edit does not support URL argument
> >
>
> Argh, are we *still* debating this issue? We already added 'svn
> propedit URL' support. I suppose I can understand adding 'svn propdel
> URL' support (since we already support 'svn rm URL')... but I'm really
> against 'svn propset URL', and the issue claims there's still no
> consensus on that. I guess we should at least update the issue's
> summary.
I agree, I'd suggest we update the summary, close the issue and either
open a new one for propdel or wait for someone else to push for it.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 10 17:02:55 2007