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

Re: multiple merge notifications

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-05-15 20:18:10 CEST

OK, I've dropped the "to path" part altogether, and made the loops use subpools.

I'm still untangling the 17 tests broken by this change, by making
them use our parser correctly.

On 5/15/07, Daniel Rall <dlr@collab.net> wrote:
> On Mon, 14 May 2007, Eric Gillespie wrote:
> ...
> > $ svn merge file:///Users/sussman/scratch/mergerepos/branch /tmp/wc
> > --- Merging revision 4 to '/tmp/wc':
> > U /tmp/wczcpu.py
> > --- Merging revisions 6-7 to '/tmp/wc':
> > U /tmp/wczstring.py
> >
> > Which now makes me say drop the " to '...':" entirely. It adds
> > nothing over the individual file lines in either case.
>
> Good point, Eric. It's either that, or make the individual path
> notification lines relative to the merge context's path. However, I
> don't like that idea, since it complicates parsing. So, +1 on
> dropping the "to '...'" suffix.
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 15 20:18:23 2007

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