Is merge broken?

[Ignacy Gawedzki <sv...@qult.net>]

I had a problem while merging a branch into the trunk of my project.  I
managed to isolate the problem into a very simple case.

The session script attached illustrates it.

In the specific case of my project, I had to merge each branch revision
separately to ensure everything will go fine, which as you could imagine was a
very tedious process.  Later, I experimented the same merge but with the
--ignore-ancestry option and everything seemed to work properly. :/

Anyway, I suppose that --ignore-ancestry is not necessarily preferable in a
real-world scenario...

Any idea or suggestion?

-- 
I drive way too fast to worry about cholesterol.

Re: Is merge broken?

[Ben Collins-Sussman <su...@collab.net>]

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

Re: Is merge broken?

[Ignacy Gawedzki <sv...@qult.net>]

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).

-- 
NO CARRIER

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Is merge broken?

[Philip Martin <ph...@codematters.co.uk>]

Ignacy Gawedzki <sv...@qult.net> writes:

> I had a problem while merging a branch into the trunk of my project.  I
> managed to isolate the problem into a very simple case.
>
> The session script attached illustrates it.
>
> In the specific case of my project, I had to merge each branch revision
> separately to ensure everything will go fine, which as you could imagine was a
> very tedious process.  Later, I experimented the same merge but with the
> --ignore-ancestry option and everything seemed to work properly. :/
>
> Anyway, I suppose that --ignore-ancestry is not necessarily preferable in a
> real-world scenario...
>
> Any idea or suggestion?

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

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org