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

Re: reverse merging a delete operation

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-08-15 14:17:16 CEST

Ben Collins-Sussman wrote:
> On Aug 15, 2005, at 6:41 AM, Ulrich Eckhardt wrote:
> > I see, so I should have specified not the folder that was deleted
> > but rather a parent thereof. I still wonder, though that's rather
> > the developer in me, whether this is the right behaviour.
> Remember that the syntax of 'svn merge' is 2 URLs and a working-copy-
> object: "compare these two URLs, and apply the difference to this
> working-copy-object right here". But that syntax will not work if
> the working-copy-object doesn't exist. You cannot apply a difference
> to a non-existent target! That's why you need to do the merge on the
> parent directory of the missing thing: compare two snapshots of the
> parent dir, and apply the diff to the parent dir.

Now in that light, it makes sense. Thanks Ben!


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 15 14:18:40 2005

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

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