Re: RefTeX Merge

[Chong Yidong <cyd@gnu.org>]

Paul Eggert <eggert@cs.ucla.edu> writes:

> One possibility is to create a new directory
> lisp/textmodes/reftex, move the RefTeX source there,
> and create a ChangeLog there, starting the ChangeLog with all the
> old history followed by a note saying what happened.

No.  Since reftex.el is one file, it is not worth creating a
subdirectory just for it.

When a file is synched to the Emacs repository, the ChangeLog typically
only describes the differences relative to the previous version.  That's
usually a truncated version of the file's full ChangeLog history, but in
practice this hasn't been a big problem.  Adding a big mass of ChangeLog
entries is not very helpful for people browsing the Emacs ChangeLog.

How large are the ChangeLog entries in question?  Putting them in the
commit log may be a fine solution.  (Normally, one would use bzr join to
preserve the history, but bzr join seems to be badly broken.)