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

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

From: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: 2007-11-27 18:59:08 CET

On Tue, 27 Nov 2007, David Glasser wrote:

> 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.

That is, feel free to commit to that area without additional approval.

  • application/pgp-signature attachment: stored
Received on Tue Nov 27 19:04:30 2007

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