Re: [Firebird-docs] Test repository CVS to git migration
Hi Mark, my Github username is MartinKoeditz. Regards, Martin -Ursprüngliche Nachricht- Von: Paul Vinkenoog [mailto:p...@vinkenoog.nl] Gesendet: Montag, 6. November 2017 03:28 An: Chatter regarding Firebird documentation <firebird-docs@lists.sourceforge.net> Betreff: Re: [Firebird-docs] Test repository CVS to git migration Helen wrote: >> I'm waiting on Helen to give the final go. > > Actually, I was waiting to see some comment from Paul V. And I was waiting for yours, since you were the only one with potential issues regarding Git :-) Anyway, since you seem to be confident it will work for you now, I'm neutral and all others are in favour, let's do it! > Hats off to you for your efforts with this and the other CVS repo's, > Mark! Hear, hear! Mark, my Github username is paulvink. Cheers, Paul -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 5-11-2017 19:27, Helen Borrie wrote: Sunday, November 5, 2017, 1:42:35 AM, Mark wrote: So what are the next steps? I'm waiting on Helen to give the final go. Actually, I was waiting to see some comment from Paul V. As Paul has given his OK too, I will perform the migration next weekend (probably Saturday, maybe Sunday) I still seem to have one or two novice issues on this side but they are not showstoppers. Over the weekend I cloned the #4 test and used it to create a private local/remote repository for the Developer's Guide stuff, as I am using a couple of experimental changes to the build ingredients. Be aware that you will need to make a fresh clone of the final repository once I've done the 'real' migration. Or at least, otherwise you'll need to do some complex steps to reconcile / merge them. Mark -- Mark Rotteveel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Sunday, November 5, 2017, 1:42:35 AM, Mark wrote: >>> So what are the next steps? > I'm waiting on Helen to give the final go. Actually, I was waiting to see some comment from Paul V. I still seem to have one or two novice issues on this side but they are not showstoppers. Over the weekend I cloned the #4 test and used it to create a private local/remote repository for the Developer's Guide stuff, as I am using a couple of experimental changes to the build ingredients. All is well, so far, I think. It will be a while before I need to push anything to the main repo. I don't think it will be too much of a problem to do that "with rule-book in hand" and Google alongside. Hats off to you for your efforts with this and the other CVS repo's, Mark! Cheers, Helen -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hi Mark, On 04/11/17 12:42, Mark Rotteveel wrote: And although it is not an impediment for the migration itself, it would be handy to have a list of the GitHub usernames of contributors that need commit access to the repository. Mine is "NormanDunbar" - if you want it now that is! Alternatively, contributors could use forks and use pull requests for their contributions. I think that this might be the better idea, but it will mean that a "benevolent dictator" (or similar) would be required to actually check and merge the pull requests. It's reasonably simple to have a fork and keep it up to date with a remote pointing at the original repository, and a "git pull" from that remote. Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hello everybody, I've worked with Mark's Git repo for a while. I haven't found any problems yet. So I think we should really migrate. I had a few requests regarding the move. More translators want to collaborate based on the Git environment. So far, I had to put these off. It would be nice to get these people on board. So what are the next steps? Regards, Martin -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 18/10/17 15:15, Mark Rotteveel wrote: Given the normalization done during conversion, that should not be a problem (unless a new file extension is introduced that isn't considered a text file by the configuration of the conversion). The thing I mentioned with autocrlf is the old way of doing things, up to Git 1.6 I think. From then on, .gitattributes is the way to go. However, if a new file type appears, Git will determine whether it is a text file by checking to see if it fails the tests for binary files. There's a good explanation of why it might be best to have both settings at http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/. Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hi Norman, >> A number of source files in my (Windows) CVS working dir have Unix line >> endings though, whereas their Git counterparts have DOS endings. >> >> That's no problem, as long as it doesn't lead to a huge number of 'changes' >> and log messages when such a file is committed, cluttering the history and >> drowning the real changes. > > This is a documented feature of Git. > > Github has a document about how you can set up your git client to cope > with this. The URL is > https://help.github.com/articles/dealing-with-line-endings/. (...) > So, windows users need: > > $ git config --global core.autocrlf true > > and Linux and Mac users need: > > $ git config --global core.autocrlf input > >> Anyway, I guess that won't occur if we commit all our work to CVS before the >> conversion/transition, get a fresh git clone afterwards and work only from >> that. Am I right? > > In a word, yes. Provided that you configure the Git client before > checking out and definitely before checking in. It's a bit risky to have it depend on the client, i.e. the individual user. But I see now that you can also take care of it in the .gitattributes file, and Mark has alreay done that. Cheers, Paul -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Afternoon Paul, On 18/10/17 14:08, Paul Vinkenoog wrote: A number of source files in my (Windows) CVS working dir have Unix line endings though, whereas their Git counterparts have DOS endings. That's no problem, as long as it doesn't lead to a huge number of 'changes' and log messages when such a file is committed, cluttering the history and drowning the real changes. This is a documented feature of Git. Github has a document about how you can set up your git client to cope with this. The URL is https://help.github.com/articles/dealing-with-line-endings/. From the online "Pro Git" book, we have this from https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration (scroll down!): core.autocrlf If you’re programming on Windows and working with people who are not (or vice-versa), you’ll probably run into line-ending issues at some point. This is because Windows uses both a carriage-return character and a linefeed character for newlines in its files, whereas Mac and Linux systems use only the linefeed character. This is a subtle but incredibly annoying fact of cross-platform work; many editors on Windows silently replace existing LF-style line endings with CRLF, or insert both line-ending characters when the user hits the enter key. Git can handle this by auto-converting CRLF line endings into LF when you add a file to the index, and vice versa when it checks out code onto your filesystem. You can turn on this functionality with the core.autocrlf setting. If you’re on a Windows machine, set it to true – this converts LF endings into CRLF when you check out code: $ git config --global core.autocrlf true If you’re on a Linux or Mac system that uses LF line endings, then you don’t want Git to automatically convert them when you check out files; however, if a file with CRLF endings accidentally gets introduced, then you may want Git to fix it. You can tell Git to convert CRLF to LF on commit but not the other way around by setting core.autocrlf to input: $ git config --global core.autocrlf input This setup should leave you with CRLF endings in Windows checkouts, but LF endings on Mac and Linux systems and in the repository. If you’re a Windows programmer doing a Windows-only project, then you can turn off this functionality, recording the carriage returns in the repository by setting the config value to false: $ git config --global core.autocrlf false So, windows users need: $ git config --global core.autocrlf true and Linux and Mac users need: $ git config --global core.autocrlf input Anyway, I guess that won't occur if we commit all our work to CVS before the conversion/transition, get a fresh git clone afterwards and work only from that. Am I right? In a word, yes. Provided that you configure the Git client before checking out and definitely before checking in. Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Mark Rotteveel wrote: > Fixed in https://github.com/mrotteveel/test-firebird-documentation-4 I cloned this repository and built a number of targets, both in master and in the B_Release branch. Everything worked exactly as in my CVS checkout. A number of source files in my (Windows) CVS working dir have Unix line endings though, whereas their Git counterparts have DOS endings. That's no problem, as long as it doesn't lead to a huge number of 'changes' and log messages when such a file is committed, cluttering the history and drowning the real changes. Anyway, I guess that won't occur if we commit all our work to CVS before the conversion/transition, get a fresh git clone afterwards and work only from that. Am I right? Cheers, Paul Vinkenoog -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hi Mark, I used your repository for few Tests and further translation. I couldn't find any problems. The Linux scripts are working and no strange behavior when I create the html or pdf outputs. >From my point of view everything is fine and it is much easier to add new >contents (for me). Regards, Martin -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
> > https://link.springer.com/book/10.1007%2F978-1-4842-0076-6 > Thanks Paul, but I was referring to the fact that I had, in the past, > downloaded the book from the https://git-scm.com/book/en/v2 address. :-) > > I already have it from the Springer address too, so I have both versions. I just threw the link up, should anybody on Firebird docs want to download it. Personally I am still learning git too... Paul -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 17/10/17 14:41, Paul Beach wrote: I'm sure I've downloaded the PDF from there in the past. (Must check!) https://link.springer.com/book/10.1007%2F978-1-4842-0076-6 Regards Paul Thanks Paul, but I was referring to the fact that I had, in the past, downloaded the book from the https://git-scm.com/book/en/v2 address. :-) I already have it from the Springer address too, so I have both versions. Thanks again. Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 17-10-2017 08:12, Köditz, Martin wrote: Hi, seems I got unsubscribed from the list. So I had some trouble to be part of the discussion. I will try it again. Do we have any problems with special characters? Please have a look at https://github.com/mrotteveel/test-firebird-documentation-3/tree/master/src/docs/refdocs-de/langref/fblangref25. Here you can see some hieroglyphs in the commit messages. Fixed in https://github.com/mrotteveel/test-firebird-documentation-4 Mark -- Mark Rotteveel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
> I'm sure I've > downloaded the PDF from there in the past. (Must check!) https://link.springer.com/book/10.1007%2F978-1-4842-0076-6 Regards Paul -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
If anyone is interested, Pro Git (Second Edition) by Scott Chacon and Ben Straub is officially available as PDF or EPUB from Springer's Web Site at https://www.springer.com/gb/book/9781484200773 - I believe that Springer are associated with Apress who publish the book. The book is also available to read online at https://git-scm.com/book/en/v2 - which is interesting as I'm sure I've downloaded the PDF from there in the past. (Must check!) You can also get the ASCIIDOC source code for the book from Github at https://github.com/progit/progit2 and build a copy for yourself. The book is Open Source, (CC Attribution Non-Commercial Share-alike 3.0 Unported Licence) and you are encouraged to fix errors and create pull requests to get the corrections (and your name!) in the next edition. ;-) HTH Cheers, Norm. -- Norman Dunbar Dunbar IT Consultants Ltd Registered address: 27a Lidget Hill Pudsey West Yorkshire United Kingdom LS28 7LG Company Number: 05132767 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 17-10-2017 11:15, Mark Rotteveel wrote: I'm sure that's not how it's done but at least I am comfortable with the migrated file formats and filesystem structure, so far. It looks possible that I will be able to sync the working source files with the git ones, much as I was doing with CVS and SVN. You should be able to also use subversion by pointing it to https://github.com/mrotteveel/test-firebird-documentation-3 I haven't tested that yet, and I expect it may need some additional tweaking of the .gitattributes configuration. I just tested GitHub subversion support, but it doesn't apply the line-ending config from .gitattributes. I had hoped it would automatically apply 'svn:eol-style=native' properties to text files, but instead it will return the files bare as stored in the repository (which means LF line-endings for text files). This makes it next to useless on Windows unless you use tools that will apply LF line-endings consistently. That means it is probably better to ignore the presence of subversion support in GitHub. Mark -- Mark Rotteveel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
On 17-10-2017 08:12, Köditz, Martin wrote: Hi, seems I got unsubscribed from the list. So I had some trouble to be part of the discussion. I will try it again. Do we have any problems with special characters? Please have a look at https://github.com/mrotteveel/test-firebird-documentation-3/tree/master/src/docs/refdocs-de/langref/fblangref25. Here you can see some hieroglyphs in the commit messages. Thanks, I hadn't noticed those. I will add the `utf-8` filter for log messages for the next conversion attempt. Mark -- Mark Rotteveel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hi, seems I got unsubscribed from the list. So I had some trouble to be part of the discussion. I will try it again. Do we have any problems with special characters? Please have a look at https://github.com/mrotteveel/test-firebird-documentation-3/tree/master/src/docs/refdocs-de/langref/fblangref25. Here you can see some hieroglyphs in the commit messages. Regards, Martin -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hello Mark, Monday, October 16, 2017, 3:41:43 AM, you wrote: > I have made a few more test runs, the end result is in > https://github.com/mrotteveel/test-firebird-documentation-3 > I think this would be the final run. > Difference against yesterday: > - Removed the d_jencks branch > - Added a .gitignore to ignore build files > - Added a .gitattributes with sane defaults for the project > As to the problem with line-endings, yesterday I looked cross-eyed, and > the problem with the four files were actual in reverse, they had LF in > CVS and CRLF in git. I have managed to normalize these files so future > updates to these files should not cause a large-scale whitespace update. I downloaded the zip from your repository and looked at a few of the .docbook files from the v.3.0.2 release notes with the editor I use for creating and updating them. They look OK to me. The ReadMe file in the base directory has messed-up line-endings, though. I guess we'll need to test what happens when one of the (currently good) source files gets updated. We definitely cannot do with extraneous white space in those files. Using the Github Desktop, I couldn't access the local copy of the unpacked zipfile but I cloned a new repository off it, which created the three git config files. It didn't copy anything else, so I file-copied all of the unpacked filesystem (except the git configuration files) into it. That sort of worked and it was able to link back to your github repository and log me in from the local config. I'm sure that's not how it's done but at least I am comfortable with the migrated file formats and filesystem structure, so far. It looks possible that I will be able to sync the working source files with the git ones, much as I was doing with CVS and SVN. Helen -- Kind regards, Helen Borrie -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
Re: [Firebird-docs] Test repository CVS to git migration
Hi Mark, > I have made a few more test runs, the end result is in > https://github.com/mrotteveel/test-firebird-documentation-3 > > I think this would be the final run. > > Difference against yesterday: > > - Removed the d_jencks branch > - Added a .gitignore to ignore build files > - Added a .gitattributes with sane defaults for the project > > As to the problem with line-endings, yesterday I looked cross-eyed, and > the problem with the four files were actual in reverse, they had LF in > CVS and CRLF in git. I have managed to normalize these files so future > updates to these files should not cause a large-scale whitespace update. Thanks for all your efforts! I'll have a look at it today (Monday) or at the latest tomorrow. Cheers, Paul -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
[Firebird-docs] Test repository CVS to git migration
I have made a few more test runs, the end result is in https://github.com/mrotteveel/test-firebird-documentation-3 I think this would be the final run. Difference against yesterday: - Removed the d_jencks branch - Added a .gitignore to ignore build files - Added a .gitattributes with sane defaults for the project As to the problem with line-endings, yesterday I looked cross-eyed, and the problem with the four files were actual in reverse, they had LF in CVS and CRLF in git. I have managed to normalize these files so future updates to these files should not cause a large-scale whitespace update. Mark -- Mark Rotteveel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
