On Sat, Oct 18, 2008 at 06:07:19PM +0200, Daniel Shahaf wrote:
> Stefan Sperling wrote on Sat, 18 Oct 2008 at 16:04 +0100:
> > Conflict stats for externals seem to work fine:
>
> Yes. It prints just one summary at the end (after updating both the
> external and non-external items).
No it doesn't. This is the output when the external has no conflicts:
$ svn update
U gamma/delta
C gamma
U alpha
C .
Fetching external item into 'ext'
U ext/gamma/delta
U ext/alpha
Updated external to revision 3.
Summary of conflicts:
Tree conflicts: 2
Updated to revision 3.
Attached is a patch which makes svn report conflict stats for
externals separately. I think this is easier to parse:
$ svn up
U gamma/delta
C gamma
U alpha
C .
Fetching external item into 'ext'
U ext/gamma/delta
U ext/alpha
Updated external to revision 3.
Updated to revision 3.
Summary of conflicts:
Tree conflicts: 2
When both have conflicts, it looks like this:
$ svn up
U gamma/delta
C gamma
Conflict discovered in 'alpha'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C alpha
Fetching external item into 'ext'
U ext/gamma/delta
C ext/gamma
Conflict discovered in 'ext/alpha'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C ext/alpha
Updated external to revision 3.
Summary of conflicts in external item:
Text conflicts: 1
Tree conflicts: 1
Updated to revision 3.
Summary of conflicts:
Text conflicts: 1
Tree conflicts: 1
OK?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-18 20:12:05 CEST