> my strategy is: > never refill/reformat existing paragraphs. > This strategy has the advantage > that the diffs reflect better the logical units > that I'm changing. True. I did the same also, but you may end up with pretty scattered pieces of text if you change your sources very often over time. The sources readability itself deminishes... But I guess that's the only chance though...
> Emac's 'ediff' is very helpful here. It let's you go through diffs I know. I used that also quite a few times. > merge CONFLICTS. It displays the 2 old versions and the merge result Didn't do merges up to now with this. > 'pcl-cvs' package--a Emacs frontend for CVS--is really wonderful. haven't used pcl-cvs very often up to now, since am mainly working with Windows now... But, well, just to add that: I fully support your ideas concerning keeping sources of LaTeX under CVS' control. I just wanted to underline that there are some tripwires in your path if you do that. I understand your boss, my bosses acted exactly the same way, so that I had to do all the updating myself and find their changes and handle the cases they didn't use the most up-to-date versions... ;) neverending story.... ;) Happens all the time! :) Marko _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
