Re: [Gnu-arch-users] Merging with the other branches.

[Charles Duffy]

On Fri, 2004-01-02 at 12:48, Aneesh Kumar KV wrote:
> What i was looking for is a functionality where in all the changes 
> applied test--trunk--0.1 appear with changelogs in test--branch--0.1.

Typically, before committing the "tla replay", it's conventional to do
something like this:

tla log-for-merge >> `tla make-log`

...then edit `tla make-log` to add a subject line and a summary of the
merge.

This doesn't include the full changelog, but only the summary lines of
the merged changes. However, the full log entry of any of these changes
is still available on request. Say the log-for-merge entry includes
this:

     * address@hidden/cscvs--ddaa--1.1--patch-2
       totla: realpath on destination directory

That entry implies that one can run "tla cat-log
address@hidden/cscvs--ddaa--1.1--patch-2" to retrieve the
full log entry for this patch.