Reintegrate Merge doesn't bring over Branch Log

I need advice on how to "have my branch and get the logs, too".

My working copy, in trunk, is stable. I make a branch and make all kinds of changes, testing as I go, and making notes in the Log files with each commit.

Now I've decided the Branch "works", and want to reintegrate it with the trunk.

I'm using TSVN 1.8.10. The Help suggests doing a Merge Reintegrate (from the Expanded menu), but this doesn't seem to "do the right thing". Instead, I do a simple Merge, leaving the Revision range blank. The Merge seems to work, my trunk files now look just like the branch. However, the log file of the Working Copy (in trunk) doesn't have any of the entries from the branch.

Is there a way to do a Branch merge that not only merges the changes, but adds the appropriate log entries? I suppose if I leave the branch alone, I can always go back and look at it. Still, having a way to include the "update history" seems like a good idea to me.

Bob Schor

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3094375

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-16 20:59:41 CET