You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Sperling <st...@elego.de> on 2007/12/03 19:16:33 UTC
Re: [PATCH] please review: kicking off the tree-conflicts branch
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 <st...@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
Re: [PATCH] please review: kicking off the tree-conflicts branch
Posted by Erik Huelsmann <eh...@gmail.com>.
On Dec 3, 2007 10:54 PM, Karl Fogel <kf...@red-bean.com> wrote:
> "Erik Huelsmann" <eh...@gmail.com> writes:
> > more feedback, but I had kind of an emergency this weekend (spending
> > most of it on my family).
>
> Urp? Everything okay...?
>
It is now, but for the third saturday in a row Eline was quite ill,
having both diarhea and throwing up. This is particularly a problem
because children her age are still too small to allow for longer
periods of fluid-loss.
So, we spent some time going to the docter's on saturday and
monitoring her on sunday, but, after another visit to the docter's
today, she's getting better again. We'll be re-introducing her slowly
to different kinds of food in the coming days. In school there are
many cases of the flu, so for now, she'll stay at home for at least
two weeks.
The problem (and the panic) comes from the fact that we don't really
know what caused the problems. We hope it's just accidental that she
caught different diseases from different places. In that case, this
was 'just' a one-off scare.
Thanks for inquiring!
Is all well on your side of the ocean?
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] please review: kicking off the tree-conflicts branch
Posted by Erik Huelsmann <eh...@gmail.com>.
On Dec 3, 2007 8:50 PM, Stefan Sperling <st...@elego.de> wrote:
> On Mon, Dec 03, 2007 at 11:32:30AM -0800, David Glasser wrote:
> > The reason it works now is that the only place to change a depth after
> > initialization is in libsvn_wc/update_editor.c(complete_directory),
> > which doesn't use svn_wc__entry_modify (which is the caller of
> > fold_entry). This is more of an explanation of why it works than why
> > it is this way, though.
>
> I'll guess I'll just keep the defines and tree-conflict related
> entry modification in svn_wc__modify_entry() for now.
> We can remove it later when it turns out we don't need it.
>
> I'm not entirely sure where exactly we'll end up updating
> the tree-conflict-data entry yet anyway.
That seems the right way to do it, especially after David explained
why it works for depth as it does. I'm sorry I wasn't able to give
more feedback, but I had kind of an emergency this weekend (spending
most of it on my family).
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] please review: kicking off the tree-conflicts branch
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Dec 03, 2007 at 11:32:30AM -0800, David Glasser wrote:
> The reason it works now is that the only place to change a depth after
> initialization is in libsvn_wc/update_editor.c(complete_directory),
> which doesn't use svn_wc__entry_modify (which is the caller of
> fold_entry). This is more of an explanation of why it works than why
> it is this way, though.
I'll guess I'll just keep the defines and tree-conflict related
entry modification in svn_wc__modify_entry() for now.
We can remove it later when it turns out we don't need it.
I'm not entirely sure where exactly we'll end up updating
the tree-conflict-data entry yet anyway.
--
Stefan Sperling <st...@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
Re: [PATCH] please review: kicking off the tree-conflicts branch
Posted by David Glasser <gl...@davidglasser.net>.
On Dec 3, 2007 11:16 AM, Stefan Sperling <st...@elego.de> wrote:
> 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?
Well, files don't have a depth, and almost all data about directories
should be drawn from their '.' entry in their own directory rather
than the one in their parent.
I don't really follow that comment, though.
The reason it works now is that the only place to change a depth after
initialization is in libsvn_wc/update_editor.c(complete_directory),
which doesn't use svn_wc__entry_modify (which is the caller of
fold_entry). This is more of an explanation of why it works than why
it is this way, though.
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org