Is there any way to perform a merge with subversion 1.6 which would preserve the branch’s history?
trunk: r1 --> r2 --------------> r5
branch: \--> r3 --> r4 /
such as that when I merge at r4 the history will contain r3 and r4? At the moment subversion will record one merge commit with the diff between r4 and r2.
What does it mean to preserve branch’s history? If you want
svn logandsvn blameto see through merges, use option--use-merge-historyor-g.