[vtk-developers] [Paraview-developers] CVS->Git Transition Plan

[Brad King]

Biddiscombe, John A. wrote:
> I'm sitting on a very large number of local diffs in my CVS tree.

Well, it's time to convert those into some local commits :)
Then you can rebase or merge with the upstream work with more
safety.

You can use 'cvs diff' to construct a patch and then apply
that to a new Git clone.  First, do 'cvs update' to get
the latest (final) version available from CVS:

  VTKfromCVS$ cvs update

Then compute your local diff in a format Git understands:

  VTKfromCVS$ cvs diff -u > ~/myvtk.patch

Start your Git clone:

  $ git clone git://vtk.org/VTK.git
  $ cd VTK

The matching Git commit is

  http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=fddd6bba

Start a local branch at that commit:

  VTK$ git checkout -b myvtk fddd6bba

Apply the patch:

  VTK$ git apply ~/myvtk.patch

Create one or more local commits:

  VTK$ git add Common/vtkMyModifiedClass.*
  VTK$ git commit
  (enter commit message in editor...use a short summary line,
   followed by a blank line, followed by a detailed description)

You can use 'git add' or even 'git add -p' to stage and commit
each of your local modifications separately.

Also, read the instructions here:

  http://www.vtk.org/Wiki/VTK/Git#Hooks

to set up local commit checks.

> Also, for commits, who do I send my public key to?

See the instructions here:

  http://www.vtk.org/Wiki/VTK/Git#Publishing

They point you to the login signup page:

  https://www.kitware.com/Admin/SendPassword.cgi

For the verification reference you can just write "existing committer"
or something to that effect.

-Brad