RE: Re: Re: Re: merging advice request

Hi Simon, thank you for your valuable answer!

Let me shortly summarize what I learn form reading
http://svnbook.red-b%e2%80%8bean.com/en/1.8/svn.advanced.vendorbr.htm%e2%80%8bl

It explains exactly the same situation I have and the same steps I was doing,
adding that I should have used the
--no-auto-props
--no-ignore
options to my svn import by the time I initiated my own repo. Using these two options the same 2-URL merge command in trial 1 would allegedly work.
Alternatively, from 1.8 on, one can use 'svn copy' to do the same thing.

This does not help me with my problem now, but it does provide a solution for the next time, so thanks again.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093618

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-31 21:58:14 CET