On Wed, Apr 24, 2013 at 11:06 PM, Z W <mpc8...@gmail.com> wrote:
>
>
>
> On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard <markp...@gmail.com> wrote:
>>
>> On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer <bob.arc...@amsi.com> wrote:
>> > Please check the poperties on one of the files. Tell me what the
>> > mergeinfo: is prior to your merge
>> > and after your merge. Up to this point we were talking about
>> > generalities, but we are getting down to specifics now.
>>
>> FWIW, after running the merge just run svn diff. It will show the
>> changes it made to the properties.
>>
>
> Hi Mark thanks for responding too.
> We are trying to automate this process for many files.
> We simply merge and commit until we hit a Conflict.
>
Here is an interesting thread from a couple months back, about subtree
mergeinfo and how elision currently works:
http://svn.haxx.se/users/archive-2012-09/0201.shtml
I suggest you read it entirely, it contains a lot of useful information.
It's possible that elision (automatically removing the superfluous
subtree mergeinfo) won't work in your case. But even if it doesn't,
you shouldn't worry too much about it. As others have said: if you use
1.7 clients, merges will be much less chatty (won't touch the subtree
mergeinfo, unless the merge actually changes something there).
--
Johan
