[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: Daniel Näslund <daniel_at_longitudo.com>
Date: Thu, 30 Jul 2009 17:27:48 +0200

>>...
>> hG 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.
>
> Mark Phippard

I apologize. What I meant was:

 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:
 Conflict discovered in 'foo1'.
 Select: (p) postpone, (df) diff-full, (e) edit,
  (mc) mine-conflict, (tc) theirs-conflict,
  (s) show all options: mc
 Conflict discovered in 'foo2'.
 Select: (p) postpone, (df) diff-full, (e) edit,
  (mc) mine-conflict, (tc) theirs-conflict,
  (s) show all options: mc
 G foo1
 G foo2
 Updated to revision 2.

 The summary is now at the END!

 Daniel
Received on 2009-07-30 17:28:05 CEST

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