Re: merging from branches with deleted and readded (replaced) files

On Monday 19 June 2006 23:28, Lieven Govaerts wrote:
> This looks like issue 2144:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2144 .
>
> The issue is solved and will be included in svn 1.4.

Thank you very much for the information. Is there a work-around? Can I:

  a: safely use svn from 1.4.x branch to do just this merge or will it break
my repo for older clients?

  b: tell svn not to include history with these file?

  c: it looks like I can't just revert these files (there's a revert bug
mentioned in the ticket) after the merge and then contruct the diffs by hand?

  d: prevent those files from being part of the merge? (How to detect them?)

--clemens

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 20 11:28:22 2006