Re: merging etc

[Dan Nicolaescu]

Richard Stallman <address@hidden> writes:

  >     I tend to believe the opposite: the description of small changes are 
easier
  >     to understand than description of combined changes.
  > 
  > The usual simplification is to replace
  > 
  >         * foo.c (fooo_bar): Call mumble.
  >     ...
  >     * foo.c (fooo_bar): New function
  > 
  > with
  > 
  >     * foo.c (fooo_bar): New function
  > 
  > since (from the point of view of the trunk) the whole
  > thing is new.

Can you please clarify, is crunching the log a blocker for the merge?
Or can the merge proceed, add the logs with the dates changed to the
date of the merge, and add an entry in FOR-RELEASE that the logs need
to be processed?