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

[issue 1610] Few questions

From: Emmanuel Fleury <emmanuel.fleury_at_labri.fr>
Date: 2006-12-24 16:00:54 CET

Hi all,

I'm pretty new here, so be patient !!! :)

I'm looking at issue 1610
(http://subversion.tigris.org/issues/show_bug.cgi?id=1610). I would like
to better understand the problem ('cause it's not totally clear to me).

As far as I understood, the problem is an extra output generated by
subversion command 'svn' when merging. Namely the following lines are
not required:

Skipped 'wc/trunk/branch1'
Skipped 'wc/trunk/branch1/trunk1'
Skipped 'wc/trunk/branch1/trunk1/www'
A wc/trunk/branch1/trunk1/www/index.html

This is mainly due to the fact that b->added (in repos_diff.c) is set to
1 so notify is called and the skip/addition is notified.

My question are:

1) Is it normal that b->added has the value 1 ?

2) If no, at what time should this flag have been set to 0 in the given
reproduction script ?

3) If yes, why not take care of the content of n->content_state (in
notify.c) is set to svn_notify_state_unchanged to discard at least the
file notification (this solution is not good because the directories
can't be handled with the same procedure as their n->content_state
variable is set to svn_wc_notify_state_unknown).


Emmanuel Fleury              | Office: 211
Associate Professor,         | Phone: +33 (0)5 40 00 35 24
LaBRI, Domaine Universitaire | Fax:   +33 (0)5 40 00 66 69
351, Cours de la Libération  | email: fleury@labri.fr
33405 Talence Cedex, France  | URL: http://www.labri.fr/~fleury
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 24 16:01:29 2006

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