Re: State of the CVS conversion

[Eric S. R. <es...@th...>]

sfeam <sf...@us...>:
> On Saturday, 04 November 2017 10:30:34 Eric S. Raymond wrote:
> > "Bastian Märkisch" <bma...@we...>:
> > > There are a few cases which we probably would like to fix because the
> > > ChangeLog was modified in an "atypical" way.  Should this be done now
> > > or can this be corrected after the conversion (sorry, not really 
> > > familiar with git yet)?
> > 
> > It can be done either way.  Safest to do it before the cutover, so the
> > changest get recorded in reconvert and not lost if we do some other
> > modification.
> 
> Could you provide a recipe for making such a correction?

If you have a speification for a changeset, like say

   <es...@th...!2017-11-04T16:44:25>

you can say

reposurgeon
reposrgeon> read gnuplot
reposurgeon> <es...@th...!2017-11-04T16:44:25> setfield author "Frd J. Foonly <fr...@fo...>"
reposurgeon rebuild

Of course, you can do more tham one of these per session.

However, after doing this you need to run forcepush to put the new
repo in place.  Patches done between your last pull and the foecepush
will be lost.

> After I tried to make a pass over the ChangeLogs fixing typos etc
> on 13 October, I thought you and Dan told me that it was wasted 
> effort because the conversion script looks at the text originally
> committed, not at the corrected text.
> So how does one fix such a problem?

See above.

For each changeset, reposurgeon looks at the associated ChangeLog (if any)
as it existed *at the time of the changeset*.  Modifying the head version
of ChangeLog to fix the typo is a good idea in itself, but does not
retrospetively fix the attributions of old changesets.

> Meanwhile, I've begun trying to actually use the converted
> repository on sf.net.    I'm having mixed success, but so far I am
> attributing that to my general cluelessness about the best 
> sequence of commands or procedures to 
>   - check out 
>   - modify files
>   - commit 
>   - push
> against a previously-existing branch.   I can make this work with the
> assistance of gitk but so far have failed to make it work from the
> command line.

Perhaps this will help?

http://rogerdudler.github.io/git-guide/

> I've pushed some trivial patches against branch-5-2-stable so
> the git content has already  diverged in minor ways from the cvs version.
> No real harm will be done if the conversion is re-executed with fewer
> rough corners.  Just let me know if that's the plan.

The plan is up to you.  But it looks like you did 'reconvert' rather than
'reconvert finish', so you probably want to do one more reconvert run.

You don't need to lose your work. From your command line

git checkout branch-5-2-stable
git format-patch HEAD~3..HEAD

This will make some patch files with the prefix 000* that you can reapply
to a git repo with the 'git am' command.

> Oh - one other question.
> Can other people actually see the files inside branch-X-X-stable
> via the SourceForge web view interface?   I find that in order to
> make this work I have to hit the "Repository Refresh" button.
> Thing is, that button is in a tab marked "admin-git-main" that 
> I don't think normal users can see.  

Look off to the left of the main window in the SourceForge web GUI.  You'll
see buttons you can use to select a branch for viewing.  They work for me.

There is something strange going on, though.  I can see all branches in
the GUI, but if I

    git clone ssh://esr@git.code.sf.net/p/gnuplot/git-main

I only get the master branch!  How did you do your clone?
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

My work is funded by the Internet Civil Engineering Institute: https://icei.org
Please visit their site and donate: the civilization you save might be your own.