[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-09-04 15:25:33 CEST

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

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 4 15:22:30 2007

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