[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-01 23:26:51 CET

On Wed, Dec 01, 2004 at 04:13:24PM -0600, kfogel@collab.net wrote:
> I think Ben had exactly that in mind, if I'm remembering a
> conversation correctly...

Not exactly. This problem was found by someone doing actual merges.
The fact that the problem ended up overlapping my work on allowing
replacements in the working copies is just a coincidence. As far as
I've seen this is a problem that's pretty unique to the merge operation.

That said, fixing Issue 2144 exposed some problems with revert, which
I'm working on now. At this point I believe it can be fixed in 1.1.x.
But if it can't I withdraw this change from 1.1.x and we'll just have to
wait on truely fixing this until 1.2.0.

So basically several things I was working on independently ended up
overlapping. Which I guess worked out rather nicely.

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 Wed Dec 1 23:28:58 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.