mergeinfo between svn copied branches and merges

Hi All

we have branchA

we svn copy branchA to produce branchB

branches A and B continues development and checkins

branchA is merged to branch B continuously

branchA finishes, tagged

we then svn copy branchA to produce branchC

we like to continue branchC merging to branchB

we hear u clearly that the merge info are copied between branches

we performed svn mergeinfo merged on branchB working copy

with branchA

we could see the correct list of merged rev numbers

we performed svn mergeinfo eligible on branchB working copy with branch A;
we see correct list of eligigle rev numbers

we learn that these numbers are used by SVN to calculate what needs to be
merged from branchB to branchA (-reintegrate)

we performed svn mergeinfo merged on branchB working copy with branchC

we see a new list (not including list of merged rev numbers from branchA)

we learn that if we reintegrate from branchB to branchC, because those list
of merged rev numbers from branchA are not there, SVN would not know those
rev numbers changes already exist in branchC

so SVN would try to reintegrate those list of merged rev numbers from
branchA on branchC

thus causing tree conflict.

Would u agree ?

How do we best recover this situation such that

1- we dont lose mergeinfo information from branchA when trying to
reintegrate from branchB to branchC

2- no tree conflicts when performing reintegrate from branchB to branchC

Thank you.
Received on 2013-05-07 17:53:34 CEST