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

Re: Merging the reintegrate-improvements branch back to trunk

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 5 Nov 2008 19:27:48 +0200 (Jerusalem Standard Time)

Julian Foad wrote on Wed, 5 Nov 2008 at 17:08 -0000:
> On Wed, 2008-11-05 at 10:27 -0500, Mark Phippard wrote:
> > 2008/11/5 Paul Burba <ptburba_at_gmail.com>:
> Of course that leads to a suggestion for improvement: show the
> difference between each subtree's mergeinfo and the root's mergeinfo.


> > > Does this error make sense? Should we keep it? Any suggestions for improvement?
> >
> > I do not see how we can do anything about the possibly large
> > differences. As long as the information is correct, I do not see a
> > problem with it. Is it possible for the error message to describe
> > what they need to do next? Are there a specific set of revisions that
> > need to be merged into the "root" to resolve this subtree mergeinfo
> > problem?
> I think it's worth doing something to prevent ridiculously long error
> messages, as they might fill the user's console or dialogue box chock
> full of revision numbers so that the actual text of the message can't be
> seen. There are simple solutions: e.g. print up to 5 subtrees, followed
> by "and N more subtrees", and for each subtree print up to 10 rev-ranges
> followed by "...".

Alternative: don't print subtrees and rev-ranges at all, unless --verbose
(or a new --bikeshed flag...) is given.


> But not before merging to trunk.

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-05 18:28:07 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.