preserving branch log messages when merging into trunk

Dear Experts,

Is there a way to preserve branch log messages when merging back into trunk?

Imagine that I make a branch called foo, do lots of commits on lots of
different files in foo, and then want to merge foo back into trunk. It
seems like I have two choices.

(1) Merge each file of foo separately. This is nice because I can use
the per file log messages from foo when merging back into the trunk.
That way further developers on trunk see the log messages from the
branch. The problem is that it loses the concept of the entire
changeset.

(2) Do the merge with a single commit. This is nice because it treats
all the changes as one changeset. But it has the disadvantage of
requiring a single log message for the entire commit.

Ideally, I'd like the advantages of (1) and (2). Is there a good way
to do that?

Thanks,
-Emin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-24 20:32:49 CET