On Wed, Jun 16, 2010 at 14:20, Bob Archer <bob.arc...@amsi.com> wrote:
>
>> You're describing a normal usage of merging.
>> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html
>>
>> You don't want to redo all those commit messages, you want the merge
>> to be aware of the history behind everything that's been done (which,
>> if you're using 1.5 or later, is taken care of), so that svn log can
>> trace back & all those messages fall right in line.
>
> Really... I didn't know this happened. If you look at the log of trunk where 
> you have merged in from branch won't it only show the merge as a single rev 
> with the message you made in the merge commit. How will you be able to trace 
> the log back through the changes made in branch?

I thought it did, maybe I'm misremembering. It's been ages since I've
done a merge.

Reply via email to