Re: [Plplot-devel] Important questions on timing and implementation of merge of the AT branch into MAIN HEAD

[Maurice L. <mj...@ga...>]

Maurice LeBrun writes:
 > Alan W. Irwin writes:
 >  > Here are the steps of what I propose at the time of the merge.
 >  > ...
 > 
 > Looking pretty good to me.

BTW I'm not sure how you managed the AT branch but be prepared for potentially
lots of petty conflicts.  It's not nearly as bad as it may look initially.  If
you ever merged the head back onto the branch, be prepared for lots of
conflicts that ask you to choose between two basically identical sections of
code.  I recommend doing plenty of recursive diffs between an existing head
and AT checkout (preferably both with -kk so you aren't bothered by $Id$
diffs) and the merged tree to see what's changed.  Good luck.. :)

-- 
Maurice LeBrun    mj...@ga...
Research Organization for Information Science and Technology of Japan (RIST)