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

Re: svn commit: r1414880 - /subversion/trunk/subversion/libsvn_client/merge.c

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 29 Nov 2012 11:38:18 -0500

On 11/28/2012 08:27 PM, C. Michael Pilato wrote:
> Paul: have you any opinions here? To summarize, I'm wondering why, in
> merge_dir_added(), in the switch that begins like so:
>
> /* Switch on the on-disk state of this path */
> switch (kind)
>
> ... the merged addition of a brand new directory earns that directory a
> registration in both the dry_run_last_added_dir slot *and* the dry_run_added
> hash, but a merged directory addition atop an unversioned or previously
> deleted directory only winds up in dry_run_last_added_dir (and *not* the
> dry_run_added hash). Any ideas?

Looks like Paul agreed that there was a potential problem here, given r1415214.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

Received on 2012-11-29 17:39:07 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.