Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Glen Starrett wrote: > Detlef Marschall wrote: >> A branch is split from the HEAD --> B1. We made changes in that branch >> and merging them to the HEAD "cvs up -jB1". For every merge we become a >> mergepoint in the HEAD, that's ok. >> >> Later we split another branch from HEAD --> B2. All mergepoints from >> branch B1 are lost in branch B2. In my opinion is this a bug. If that's the case, I see what you mean. >> When we merge from branch B1 to branch B2 cvs will merge all changes >> from the start of B1 until the last revision in the Branch B1 instead >> only the last changes. > > So are you saying this happens with every B1 -> B2 merge, or just the > first? To me it sounds as if it were only the first merge. Which could be worked around like Glen said, or by tagging the merge point on B1 and do a diff merge when merging the first time from B1 into B2. After that, you should have the merge point in B2. Gerhard