[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-11-26 14:38:45 CET

On Nov 26, 2007 6: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?
>
> I guess the "():" in the log message can be omitted, right?

+1 and yes on the log message.

-- 
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 Nov 26 14:39:04 2007

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