Re: State of the CVS conversion

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

sfeam <sf...@us...>:
> On Saturday, 04 November 2017 17:17:39 Eric S. Raymond wrote:
> > 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.
> 
> You lost me. 
> How would I have a specification for a changeset in that form?
> If this is editing the cvs copy, how is it better than using sed or vi to
> do the same thing?

This is not editing the CVS copy.  It's editing the git conversion


>  
> > 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.
> 
> Push it where?  Back to SourceForge?

Exactly.

> I think I'm not going to touch any of this.  If Dan or Bastian or you send me
> an updated reconvert script I'd be happy to run it, but I worry I'll do more
> harm than good if I start editing with unfamiliar tools.

We know these things so you don't have to. :-)

> > 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?
> 
> Since I don't have any prior expectations, I can't say whether I got everything
> at once or not.  How would I tell?  
> 
> Here's what I did:
> 
> $ git clone ssh://sfeam@git.code.sf.net/p/gnuplot/git-main gnuplot-git-main
> 
> $ cd gnuplot-git-main
>    # Now the current directory tree holds what looks like the current tip files
>    # However gitk run in this same directory shows all the branches,
>    # so I figured the rest are packed in ./.git somewhere to be reconstructed
>    # on demand.  No?
>    # The gitk GUI run from here pushes to origin
> 
> $ git checkout -track origin/branch-5-2-stable
>    # Magically the contents of the current directory tree switch to the branch tip
>    # I was surprised, but since I didn't know otherwise I assumed this was OK
>    # Did it unpack them from the local copy or pull for sf.net?  I don't know.
>    # The gitk GUI run from here now pushes to origin/branch-5-2-stable
> 
> That's as far as I got, but it was sufficient to show that I could use gitk to
> modify either the main branch or the 5-2-stable branch.

I forgot that you have to use --mirror to pull all branches.  It's OK.
-- 
		<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.