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

Re: Notifications when merge aborts due to conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-09-12 19:05:31 CEST

On 9/12/07, Daniel Rall <dlr@finemaltcoding.com> wrote:
>
> On Sep 12, 2007, at 8:23 AM, Mark Phippard wrote:
>
> > Dan,
> >
> > Starting to test this feature to implement in the merge client. Is
> > this what you expected the command line output to look like? It seems
> > like the line breaks are not right:
> >
> > $ svn merge -g
> > --- Merging r5 through r8:
> > U src/com/collabnet/banking/tests/BankingTests.java
> > Conflict discovered in 'src/com/collabnet/banking/models/
> > BankAccount.java'.
> > Select: (p)ostpone, (d)iff, (e)dit, (h)elp : p
> > C src/com/collabnet/banking/models/BankAccount.java
> > U docs/products/index.html
> > U docs/about/index.html
> > subversion/libsvn_client/merge.c:2184: (apr_err=155015)
> > svn: One or more conflicts were produced while merging r4:8 into
> > '.' --
> > resolve all conflicts and rerun the merge to apply the remaining
> > unmerged revisions
> > $
>
> I was assuming that target_wcpath (the input to the
> make_merge_conflict_error routine which produces the error which
> causes this output) could potentially be quite long. Given that, how
> do you suggest the line breaks on this output should go (e.g. move
> some of "resolve all ..." up onto the previous line)?

When I ran it from Subclipse, I noticed this -- since the target
became an absolute path. It looked better for sure.

What about the next two lines? They seem like they are breaking
early. Is there a standard for this or is to allow translation room?

Maybe the message could just omit the path? That information is
readily available in the previous messages.

-- 
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 Wed Sep 12 23:54:31 2007

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