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

Re: deleted-with-history [sic] after merge

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: Fri, 29 Feb 2008 15:58:07 -0600

On Fri, Feb 29, 2008 at 11:06 AM, David Glasser
<glasser_at_davidglasser.net> wrote:

> You sure? From libsvn_fs_fs/tree.c(merge):
>
> /* If SOURCE-ENTRY and TARGET-ENTRY are both null, that's a
> double delete; flag a conflict. */
> if (s_entry == NULL || t_entry == NULL)
> return conflict_err(conflict_p,
> svn_path_join(target_path,
> a_entry->name,
> iterpool));

I have a vague recollection of this code flip-flopping back and forth
over the years, and cmpilato being at the helm of such decisions.
Mike, can you remember what's up here?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-29 22:58:25 CET

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