Re: [PATCH] 'svn merge' tree conflict use cases

On Nov 26, 2007 3:57 AM, Stefan Sperling <stsp@elego.de> wrote:
> On Fri, Nov 23, 2007 at 07:00:11PM +0100, Stephen Butler wrote:
> > Hi folks,
> >
> > As a follow-up to the existing 'svn update' use cases for the tree
> > conflicts problem, here's a patch for the notes directory describing
> > the corresponding 'svn merge' use cases.
> >
> > Regards,
> > Steve
> >
> > [[[
> >
> > Describe simple 'svn merge' use cases for tree conflict handling. See
> > issue #2282 for background.
> >
> > * notes/tree-conflicts/use-cases.txt
> > (): Minor tweak to use case 2. Added use cases 4-6.
> >
> > ]]]
>
>
> Can a full commiter take a quick look over this and if there
> are no obvious issues allow me to commit this to trunk?

Stefan, I checked with the other full committers and you should feel
comfortable committing to trunk/notes/tree-conflicts in addition to
the tree conflicts branch.

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org