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

Re: Let's set a date/goal for the 1.5 Branch

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-09-04 17:05:00 CEST

On 9/4/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> I'm good with the 'goal' of branching in mid-October, at least as a
> motivator and triage concept.
>
> I've got two things on my plate right now:
>
> * copy-on-update branch
>
> * polish the interactive conflict prompting feature

You have a couple of issues "assigned" to you in the 1.5 milestone.
They all relate to notifications. I think these issues sort of
morphed into what you are working on now. It'd be helpful if you
could update them, close them, create new issues etc.. I am not sure
if there is any remaining work on notifications in general. If there
is, it is possible pburba could take on that remaining work so you can
focus on the above. We just need you to define what might be
remaining.

> And I'd still like to see if I can finish what I've been calling 'deep
> conflicts': rather than have a merge abort when it tries to patch a
> conflicted file, I'd like the merge to keep going, and have the file's
> wc metadata remember the missing-revision-ranges it needs. It would
> be a special sort of conflict not resolvable via 'svn resolved', but
> only by allowing 'svn merge' to apply the missing ranges.

I think these would be nice to have, but I suspect we are at the point
where we have to start thinking about a 1.6 release for things like
this. Especially since it involves UI which always has some bikeshed
around it. If you have the time though, by all means, take a crack at
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 Tue Sep 4 17:01:59 2007

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