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

Re: issue 3432 - summary of conflicts and skips

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 30 Jul 2009 11:11:12 -0400

On Thu, Jul 30, 2009 at 11:05 AM, Daniel Näslund<daniel_at_longitudo.com> wrote:
> Hello!
>
> I'm a newbie looking into issue 3342. I need some advice on the design
> of the solution.
>
> If I do an update s summary is printed. If there are conflicts a summary
> for each file is printed after each interactive operation. If many
> files, the summary may scroll off the screen. An example:
>
> test2> s up
> Conflict discovered in 'foo1'.
> Select: (p) postpone, (df) diff-full, (e) edit,
>        (mc) mine-conflict, (tc) theirs-conflict,
>        (s) show all options: mc
> G    foo1
> Conflict discovered in 'foo2'.
> Select: (p) postpone, (df) diff-full, (e) edit,
>        (mc) mine-conflict, (tc) theirs-conflict,
>        (s) show all options: mc
> G    foo2
> Updated to revision 2.
>
> Better would be to have this printed at the bottom:
> ...
> G               foo1
> G   foo2
> Updated to revision 2.

I do not believe that is what this issue 3342 is about. You cannot
remove the notifications you show above, those are necessary to
resolve the conflict as part of the merge. If you do not want to see
those during the merge, you can either use the --accept option on the
command line or turn the feature off in your config file.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377003
Received on 2009-07-30 17:11:56 CEST

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