>>> <herbert.poul@gmail.com> wrote:
> Hi,
> I've probably just missed something in the FAQ ‑ but here is my problem:
> i'm having a trunk and a branch .. and i'm creating a file in the
> trunk within a directory which was created before creating the
> branch.. this directory is then removed in the branch ..
> and the branch is merged back into the trunk ..
> this results in the deletion of the file i created in the trunk ..
> without a conflict.. (i get the notice tough, that the file was
> deleted.. )
>
> <snip>
I think some changes I'm trying to make to svnmerge.py will
be a workaround for this, if svnmerge.py is always used for
merging. If I'm successful I'll try to test it against your
described scenario and let the list know. There have been
various discussions on it in the users list; if anyone sees
holes in my approach pls let me know. :)
-Luke
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 15 17:15:00 2007