On Thu, Apr 26, 2007 at 03:57:45PM +0200, Abdelrazak Younes wrote:
> [EMAIL PROTECTED] wrote:
> >Author: poenitz
> >Date: Thu Apr 26 14:54:21 2007
> >New Revision: 18036
> >
> >URL: http://www.lyx.org/trac/changeset/18036
> >Log:
> >merge LyXTabular.{cpp,h} and insets/InsetTabular.{cpp,h}. More 
> >reorganization necessary. Not now...
> 
> I am a bit worried that we loose all svn history with those merging. 
> Merging in qt4/ is fine as the code is simple. But for things like 
> tabular etc, I wonder if this is a good idea.

LyXTabular was only used in inset/insettabular. One reason why tabulars
never got cleaned up after the Big Rewrite (in yonder dark ages, done by
Juergen V.) is that more or less everything is duplicated in both files.
In fact, LyXTabular is something like a pimpl for InsetTabular, so
having it in the same files pretty much matches our current rules.

Of course, there's "real" cleanup needed, but I wanted to restrict
myself in this stage to changes to the file system and 'trivial' changes
(whitespace, formatting, removal of completely unneeded code)

I understand that keeping change history is interesting, but I am not
sure how merging file histories might look in practice.  Maybe a big
commit message containg the entire log of the merged file. Note that
the history right now is not completly lost (albeit not readily
accessible)

Andre' 
 

Reply via email to