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

Re: Is merge broken?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-04-05 02:57:32 CEST

On Apr 4, 2005, at 12:46 PM, Ignacy Gawedzki wrote:

> On Mon, Apr 04, 2005 at 05:19:09PM +0100, thus spake Philip Martin:
>> You are trying to merge a directory replace, I think you have
>> rediscovered issue 1516:
>>
>> http://subversion.tigris.org/issues/show_bug.cgi?id=1516
>
> Thanks for pointing out. I understand that this is completely
> equivalent to
> trying to remove a directory and add or move another into the same
> name (i.e.
> replace it) in the same transaction.
>
> It's really a pity this is not supported at this time (any plans to
> support it
> in the future?), since this impossibility prevents clean revision
> committing
> (one must first commit directory removal and then schedule directory
> copy,
> move or addition).
>

It was fixed, but fixing the bug revealed an even-worse bug, so we
undid the fix. We hope to fix both bugs 1.3. See issues 2144 and
2148.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 5 03:00:57 2005

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