Hi Stefan, That makes sense, my understand of the process was a bit off but I see what you mean.
I'm currently looking to test the fix you sent for the client. I will respond as soon as I have tested it. Many Thanks for your help, Stefan On 16/09/2013 15:33, "Stefan Sperling" <s...@elego.de> wrote: >On Mon, Sep 16, 2013 at 12:06:46PM +0000, Goor, Stefan wrote: >> I think the fact the error related to doing a reintegrate merge is also >> wrong. Given that the merge was from a trunk project (that the branch >>was >> created from) to the the branch, should it not have been attempting a >> regular merge? It is my understanding that a reintegrate merge is done >> (automatically since 1.8) when bringing a branch back into the project >>it >> was created from. > >It's a little more complex than that. > >There is no reason to be surprised if the new 'complete merge' in >Subversion 1.8 attempts to reintegrate the trunk into a branch. >Whether a sync or reintegrate merge is performed depends on prior >merge history. A reintegrate merge is performed whenever a merge's >direction differs from the direction of the previous merge. A sync >merge is performed whenever the merge direction stays the same. > >A simple example: > >Create branch B from trunk. > >Merges performed, in sequence: Merge type selected by SVN: > >Merge from trunk to B sync merge >Merge from B to trunk reintegrate merge >Merge from B to trunk sync merge >Merge from B to trunk sync merge >Merge from B to trunk sync merge >Merge from trunk to B reintegrate merge >Merge from trunk to B sync merge >Merge from trunk to B sync merge >Merge from B to trunk reintegrate merge >Merge from B to trunk sync merge > >Can you see the pattern?
