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

Re: [PATCH] issue 3342 - the right patch!

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 12 Aug 2009 13:47:18 +0100

On Sat, 2009-08-08, Daniel Näslund wrote:
> [[[
> Fix issue #3342: Summary of conflicts printed at end of up/sw/merge
> * subversion/svn/merge-cmd.c
> (svn_cl__merge): Call svn_cl__print_conflict_stats.
>
> * subversion/svn/cl.h
> (svn_cl__print_conflict_stats): Declare.
>
> * subversion/svn/update-cmd.c
> (svn_cl__update): Call svn_cl__print_conflict_stats.
>
> * subversion/svn/switch-cmd.c
> (svn_cl__switch): Call svn_cl__print_conflict_stats.
>
> * subversion/svn_notify.c
> (svn_cl__print_conflict_stats): Changed name from print_conflict_stats.

Also mention the change you made to notify().

> * subversion/svn_notify.c
> (notify): Remove references to print_conflict_stats. Do not clear
> counters for conflicts.
>
> * subversion/tests/cmdline/basic_tests.py
> (basic_update): Changed tests involving skipping to include summary.
> ]]]
[...]
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2381637

Hi Daniel. This all looks great but I think it makes an unintended
behaviour change. If 'foo' is non-existent, then:

Running svn v1.6:
[[[
$ svn up foo
Skipped 'foo'
]]]

Running your version, not in a WC:
[[[
$ svn up foo
Skipped 'foo'
Summary of conflicts:
  Skipped paths: 1
]]]

That's good.

Running your version, in a WC:
[[[
$ svn up foo
At revision 38693.
]]]

That's the unintended change. The failure to print "Skipped 'foo'" is
serious. The fact that it prints "At revision ..." is not so serious: we
could accept that (in addition to a "Skipped" message) because it is
analogous to the case of updating a versioned child of a versioned
directory.

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2382884
Received on 2009-08-12 14:47:50 CEST

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