On Mon, Jul 07, 2008 at 03:32:56PM -0400, Karl Fogel wrote:
> > --- branches/issue-2843-dev/subversion/libsvn_client/merge.c (r31985)
> > +++ branches/issue-2843-dev/subversion/libsvn_client/merge.c (r31986)
> > @@ -3260,6 +3260,8 @@ get_mergeinfo_walk_cb(const char *path,
> > !svn_path_compare_paths(path, wb->merge_target_path);
> > const char *parent_path = svn_path_dirname(path, pool);
> >
> > + /* TODO(#2843) How to deal with a excluded item on merge? */
> > +
> > /* We're going to receive dirents twice; we want to ignore the
> > first one (where it's a child of a parent dir), and only use
> > the second one (where we're looking at THIS_DIR). The exception
>
> I think we should handle that the same way we would if the item were
> deleted... which we can see a bit later in the code:
>
> /* Ignore the entry if it does not exist at the time of interest. */
> if (entry->deleted)
> return SVN_NO_ERROR;
>
I'm still not sure of this. If you go further, there are some code dealing
with sparse directories and absent files. I really have no idea how the
mergeinfo is maintainted. Maybe I should go through the document first.
Rui
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-24 16:44:24 CEST