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

Re: [PATCH] please review: kicking off the tree-conflicts branch

From: Stefan Sperling <stsp_at_elego.de>
Date: 2007-12-03 20:16:33 CET

Hey Erik,

On Wed, Nov 28, 2007 at 09:30:41PM +0100, Erik Huelsmann wrote:
> - The patch picks up a comment line in libsvn_wc/wc.h about there
> being no #define for DEPTH because it's only relevant to the THIS_DIR
> entry. From your description, I get the feeling the same applies to
> the TREE_CONFLICT_DATA and TREE_CONFLICT_DESCRIPTION items. Is that
> correct? And do you think it's like DEPTH enough to do without the
> defines?

Hmmm...

We honestly don't know.

Can someone explain why fold_entry in libsvn_wc/entries.c does not require a
modify flag for depth? A comment says depth was "only meaningful on the
this-dir entry anyway". Why does not needing a modify flag follow from this?
Is it because for files, the depth will be inherited from the parent directory?

Our tree conflict info will also only be stored in the this-dir entry. But we
still need to modify it when conflicts are added/removed (resolved), hence we
need to modify the entry, hence we need a flag... or don't we?

Thanks,

-- 
Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on Mon Dec 3 20:16:49 2007

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