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

Re: [PATCH] Merging replacments of directories and Issue #2144

From: Ben Reser <ben_at_reser.org>
Date: 2004-12-02 00:07:02 CET

On Wed, Dec 01, 2004 at 10:44:36PM +0000, Philip Martin wrote:
> Ben Reser <ben@reser.org> writes:
> > As far as I've seen this is a problem that's pretty unique to the
> > merge operation.
> At present 'svn add' can be used to replace a schedule delete item but
> trying to use 'svn cp' doesn't work (an issue exists). There are
> problems in libsvn_client that stop the operation getting as far as
> svn_wc_ensure_adm but I think your change is part of the solution.

Hmm, I hadn't run into the svn_wc_ensure_adm problem. But I think I
know why. cp by itself can't replace a directory. Because if the
destination is a directory we place the source into the directory... I
hadn't bothered to try to implement the following scenario:
svn rm dir
svn cp -r 5 dir

This does indeed fail but it fails further up before

Anyway after looking at the revert problem in Issue #2148. I think the
original tactic I took in fixing the cp problem isn't the way to go.
Because I was ignoring the directory problem because I was thinking it
didn't exist.

I'll send an email detailing further what I think needs to be done.

Ben Reser <ben@reser.org>
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 2 00:10:16 2004

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.