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

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

Alan W. Irwin writes:
 > Here are the major categories of work left to do on this project
 > with highest priority first:
 > 
 > (1) tk binding.
 > 
 > (2) the remainder of the dynamic drivers including tk and tkwin
 > 
 > +++++++++++++++++++ (proposed date of merge, see below)

That would be fine with me.

 > Here are the steps of what I propose at the time of the merge.
 > ...

Looking pretty good to me.

 > (3) do the merge (straight from the "merging an entire branch" section
 > available with the "info cvs" command).  First get MAIN HEAD with normal
 > checkout then update the local copy with a merge.
 > 
 > cvs checkout -d plplot plplot
 > cd plplot
 > # This only changes working directory
 > cvs update -kk -j AT
 > 
 > Question: would it be better to break this up by doing say the bindings
 > directory, then the examples directory, then the overall directory?
 > Can you break it up that way?

You could but I'd just do the whole thing all at once, capturing the output in
its own window or file, which you'll need to refer to when resolving
conflicts.  Or you can always recover what files had conflicts by doing a 'cvs
-nq update', one of my favorite commands.  If the merge is done in a dir you
don't want it, just remove the whole directory.  Doing it all at once is
simplest and removes the danger that you'll forget to do it somewhere.

 > Question: can this commit stage be done one sub-directory tree at a time
 > if the answer to the previous question in (3) is yes?

Sure.

 > (6) I assume from my reading (but gurus please confirm) that the sticky tags
 > (generated, e.g., by the -kk option above) only concern local directories
 > and have nothing to do with the repository.  So to get rid of them locally
 > after the commit(s) are done is do a
 > 
 > cvs update -a
 > 
 > or a fresh checkout.  Is that correct?

Correct.

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