[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-04-04 18:19:09 CEST

Ignacy Gawedzki <svn@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
Received on Mon Apr 4 18:24:19 2005

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