Menu
▾
▴
gnuplot-beta
|
From: <es...@th...> - 2017-11-01 17:20:37
|
I've uploaded a fresh version of rhe conversion machinery where you can fetch it at wget http://www.catb.org/~esr/gnuplot-conversion.tar.gz Problems solved in this release: * Changelog scanning catches the cases Bastian was worried about. It's probably done. Remaining issues: * The 3.7.x branch is still a mess, with CVS tip state not matching the git tip state. * Empty log messages still need to be filled in. -- <a href="http://www.catb.org/~esr/">Eric S. Raymond</a> Where rights secured by the Constitution are involved, there can be no rule making or legislation which would abrogate them. -- Miranda vs. Arizona, 384 US 436 p. 491 |
|
From: Ethan A M. <sf...@us...> - 2017-11-01 18:12:00
|
On Wednesday, November 1, 2017 10:20:28 AM PDT Eric S. Raymond wrote: > I've uploaded a fresh version of rhe conversion machinery where you > can fetch it at > > wget http://www.catb.org/~esr/gnuplot-conversion.tar.gz > > Problems solved in this release: > > * Changelog scanning catches the cases Bastian was worried about. > It's probably done. > > Remaining issues: > > * The 3.7.x branch is still a mess, with CVS tip state not matching > the git tip state. Since it is very unlikely that anyone needs to work from git tip for 3.7, this doesn't seem like a big deal. > * Empty log messages still need to be filled in. Why? Ethan |
|
From: Bastian M. <bma...@we...> - 2017-11-04 07:25:46
|
> Gesendet: Mittwoch, 01. November 2017 um 18:20 Uhr > Von: "Eric S. Raymond" <es...@th...> > An: gnuplot-beta <gnu...@li...> > Betreff: State of the CVS conversion > > I've uploaded a fresh version of rhe conversion machinery where you > can fetch it at > > wget http://www.catb.org/~esr/gnuplot-conversion.tar.gz > > Problems solved in this release: > > * Changelog scanning catches the cases Bastian was worried about. > It's probably done. Great. Thanks. Looking good as far as I can tell from a quick look at the conversion. 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)? Bastian |
|
From: Eric S. R. <es...@th...> - 2017-11-04 14:30:42
|
"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. -- <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. |
|
From: sfeam <sf...@us...> - 2017-11-04 16:30:21
|
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? 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? 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. 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. 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. Ethan |
|
From: Eric S. R. <es...@th...> - 2017-11-04 21:17:47
|
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. |
|
From: sfeam <sf...@us...> - 2017-11-04 22:16:10
|
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? > 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? 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. > > 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. Oops. Yeah, I missed that. Sigh. That means I have to blow away the sf.net repository, reinitialize, and push from the local copy again. Right? > 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. Thanks, that's useful. In this case I have all the patches anyhow but I can see that's useful for catching changes by other people. > > 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. Good to know. They work for me also, but they don't seem to show recent changes until I hit the "Repository Refresh" button. > 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. Ethan |
|
From: Eric S. R. <es...@th...> - 2017-11-05 05:13:36
|
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. |
|
From: Bastian M. <bma...@we...> - 2017-11-11 08:31:58
|
> Von: "Eric S. Raymond" <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. I am having trouble with the syntax. I was trying to add a few lines to the reconvert script at the end of the reposurgeon inline script, before the "dedup" statement. Like this: <bma...@we...!2014-06-01T11:26:58+02:00> setfield author "Tatsuro Matsuoka <tma...@ya...>" But I am getting error messages: reposurgeon: couldn't match a name at <bma...@we...!2014-06-01T11:26:58+02:00> It does not help to revert the order of time and email. What am I doing wrong? Bastian |
|
From: Eric S. R. <es...@th...> - 2017-11-11 17:23:56
|
"Bastian Märkisch" <bma...@we...>: > But I am getting error messages: > reposurgeon: couldn't match a name at <bma...@we...!2014-06-01T11:26:58+02:00> > > It does not help to revert the order of time and email. What am I doing wrong? Possibly nothing. I recently found a bug in the way the action-stamp table was being built; you should get the repo-tip version of reposurgeon and see if it solves that problem. -- <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. |
|
From: Bastian M. <bma...@we...> - 2017-11-12 12:57:16
|
> Von: "Eric S. Raymond" <es...@th...> > "Bastian Märkisch" <bma...@we...>: > > But I am getting error messages: > > reposurgeon: couldn't match a name at <bma...@we...!2014-06-01T11:26:58+02:00> > > > > It does not help to revert the order of time and email. What am I doing wrong? > > Possibly nothing. I recently found a bug in the way the action-stamp table > was being built; you should get the repo-tip version of reposurgeon and > see if it solves that problem. Unfortunately, that didn't fix the problem. Searching for the date in the converted repo like git log --before="2014-06-01T11:26:58+02:00" -1 finds the correct entry. So I think the date is correct. More ideas? Bastian |
