Re: [Rd] Why R should never move to git

I attach the Github Flow for teams and projects with regular deployments: https://guides.github.com/pdfs/githubflow-online.pdf https://guides.github.com/introduction/flow/ Tips: * Always Do pull requests based on branches (never on the master). * Keep your Fork Synchronized with the

Re: [Rd] Why R should never move to git

> So I created a branch within my fork, and committed the change there. But > Github provides no way to create a pull request that only includes the new > stuff! > Every attempt I made would have included everything from both bug fixes. I have been doing some tests, and I think that this issue

Re: [Rd] Why R should never move to git

Yes, indeed Gitlab GUI Core Code is Open Source (Libre / Community Edition): https://gitlab.com/gitlab-org/gitlab-ce > But his instructions required command-line git, and my main claim is that > Github is not good enough to do the kinds of things I want to do and R Core > would need to do. > >

Re: [Rd] Why R should never move to git

On 31 January 2018 at 16:18, Barry Rowlingson wrote: >> > > Let the record also state that *gitlab* is an open source project and can be > downloaded and self-hosted, like gogs, but unlike github. Good to know. Nice one: https://github.com/gitlabhq/gitlabhq Best,

Re: [Rd] Why R should never move to git

On Tue, Jan 30, 2018 at 11:07 PM, Suzen, Mehmet wrote: > This might be off topic, but if R-core development ever moves to git, > I think it would make sense to have its own git service hosted by a > university, rather than using > github or gitlab. It is possible via

Re: [Rd] Why R should never move to git

Gabor, I was just pointing out options. I think it is more of a policy decision than a technical one. For example, the very mailing list we are using is run by ETH Zurich with Martin Maechler. But it can well be run on google groups. Maybe this list should also move to google groups, it is

Re: [Rd] Why R should never move to git

While this is a very hypothetical argument, you could at least explain _why_ you would think so. If you were thinking about the unlikely event of GitHub / GitLab closing business, that is _not_ such a big to any active project that is hosted there. Gabor On Tue, Jan 30, 2018 at 11:07 PM, Suzen,

Re: [Rd] Why R should never move to git

This might be off topic, but if R-core development ever moves to git, I think it would make sense to have its own git service hosted by a university, rather than using github or gitlab. It is possible via https://gogs.io/ project. Just for the record. Best, -m

Re: [Rd] Why R should never move to git

In case it's useful: A) Git Cheatsheet: ADVANCED (GitHub) https://www.google.es/url?sa=t=web=j=https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf=2ahUKEwjkhYmdt_bYAhXIwBQKHXWdBfoQFjAAegQIERAB=AOvVaw3RoN21aynhcDHqKncV31el B) Git Cheatsheet: BASICS (GitHub)

Re: [Rd] Why R should never move to git

I do not mind investing as much time as necessary :-) > If you ever need to document issues / coding recipes related to GIT / SVN: > > * I could pick the commands from e-mails. > * Any documentation you send me. > * Or books (http://shop.oreilly.com/product/0636920022862.do), web pages, etc.. > >

Re: [Rd] Why R should never move to git

If you ever need to document issues / coding recipes related to GIT / SVN: * I could pick the commands from e-mails. * Any documentation you send me. * Or books (http://shop.oreilly.com/product/0636920022862.do), web pages, etc.. And create a wiki / documentation page in any platform, in order

Re: [Rd] Why R should never move to git

2018-01-25 16:07 GMT+01:00 Duncan Murdoch : > On 25/01/2018 7:44 AM, Gábor Csárdi wrote: >> >> On Thu, Jan 25, 2018 at 12:34 PM, Duncan Murdoch >> wrote: >> [...] >>> >>> but that branch doesn't show up in the Github web site. >> >> >> It is

Re: [Rd] Why R should never move to git

On 25/01/2018 7:44 AM, Gábor Csárdi wrote: On Thu, Jan 25, 2018 at 12:34 PM, Duncan Murdoch wrote: [...] but that branch doesn't show up in the Github web site. It is right there: https://github.com/dmurdoch/manipulateWidget/branches Any suggestions? Personally

Re: [Rd] Why R should never move to git

On 25/01/2018 7:44 AM, Joris Meys wrote: Hi Duncan, I can see that branch on your github. Remember that you have to reload the github page to see the latest additions to your repo. It doesn't do that automatically. Thanks, that was the issue. Duncan Murdoch

Re: [Rd] Why R should never move to git

On 01/25/2018 07:09 AM, Duncan Murdoch wrote: On 25/01/2018 6:49 AM, Dirk Eddelbuettel wrote: On 25 January 2018 at 06:20, Duncan Murdoch wrote: | On 25/01/2018 2:57 AM, Iñaki Úcar wrote: | > For what it's worth, this is my workflow: | > | > 1. Get a fork. | > 2. From the master branch, create

Re: [Rd] Why R should never move to git

This is exactly the instruction given in  https://xkcd.com/1597/ cheers, J.O. On 25/01/18 14:48, Mario Emmenlauer wrote: Hi Duncan! I think there are many users whose first experiences with git where frustrating, and trust me, many people here can relate to your pain. I can certainly say that

Re: [Rd] Why R should never move to git

Hi Duncan! I think there are many users whose first experiences with git where frustrating, and trust me, many people here can relate to your pain. I can certainly say that I can. At first, git makes significant effort to become fluent in seemingly "simple" tasks. I can literally feel your pain

Re: [Rd] Why R should never move to git

Hi Duncan, I can see that branch on your github. Remember that you have to reload the github page to see the latest additions to your repo. It doesn't do that automatically. Cheers Joris On Thu, Jan 25, 2018 at 1:34 PM, Duncan Murdoch wrote: > On 25/01/2018 7:03 AM,

Re: [Rd] Why R should never move to git

On Thu, Jan 25, 2018 at 12:34 PM, Duncan Murdoch wrote: [...] > but that branch doesn't show up in the Github web site. It is right there: https://github.com/dmurdoch/manipulateWidget/branches > Any suggestions? Personally I would suggest to call it master, because it

Re: [Rd] Why R should never move to git

On 25/01/2018 7:03 AM, Iñaki Úcar wrote: 2018-01-25 12:20 GMT+01:00 Duncan Murdoch : On 25/01/2018 2:57 AM, Iñaki Úcar wrote: For what it's worth, this is my workflow: 1. Get a fork. 2. From the master branch, create a new branch called fix-[something]. 3. Put

Re: [Rd] Why R should never move to git

On 25/01/2018 6:49 AM, Dirk Eddelbuettel wrote: On 25 January 2018 at 06:20, Duncan Murdoch wrote: | On 25/01/2018 2:57 AM, Iñaki Úcar wrote: | > For what it's worth, this is my workflow: | > | > 1. Get a fork. | > 2. From the master branch, create a new branch called fix-[something]. | > 3.

Re: [Rd] Why R should never move to git

2018-01-25 12:20 GMT+01:00 Duncan Murdoch : > On 25/01/2018 2:57 AM, Iñaki Úcar wrote: >> >> For what it's worth, this is my workflow: >> >> 1. Get a fork. >> 2. From the master branch, create a new branch called fix-[something]. >> 3. Put together the stuff there,

Re: [Rd] Why R should never move to git

On 25 January 2018 at 06:20, Duncan Murdoch wrote: | On 25/01/2018 2:57 AM, Iñaki Úcar wrote: | > For what it's worth, this is my workflow: | > | > 1. Get a fork. | > 2. From the master branch, create a new branch called fix-[something]. | > 3. Put together the stuff there, commit, push and open

Re: [Rd] Why R should never move to git

On 25/01/2018 2:57 AM, Iñaki Úcar wrote: For what it's worth, this is my workflow: 1. Get a fork. 2. From the master branch, create a new branch called fix-[something]. 3. Put together the stuff there, commit, push and open a PR. 4. Checkout master and repeat from 2 to submit another patch.

Re: [Rd] Why R should never move to git

For what it's worth, this is my workflow: 1. Get a fork. 2. From the master branch, create a new branch called fix-[something]. 3. Put together the stuff there, commit, push and open a PR. 4. Checkout master and repeat from 2 to submit another patch. Sometimes, I forget the step of creating the

Re: [Rd] Why R should never move to git

On Thu, Jan 25, 2018 at 12:43 AM, Duncan Murdoch wrote: [...] > But that's only half the battle. If I did that and emailed the diff to a > maintainer, I'm guessing I'd be told I should put together a PR instead. > And as I found out, that's not easy, if I already have a

Re: [Rd] Why R should never move to git

On 24/01/2018 7:29 PM, Gábor Csárdi wrote: On Thu, Jan 25, 2018 at 12:24 AM, Duncan Murdoch wrote: [...] Thanks, those instructions appear to have worked. For comparison purposes, the equivalent steps in svn would be svn diff -r PREV:HEAD --internal-diff > patchfile

Re: [Rd] Why R should never move to git

On Thu, Jan 25, 2018 at 12:24 AM, Duncan Murdoch wrote: [...] > Thanks, those instructions appear to have worked. > > For comparison purposes, the equivalent steps in svn would be > > svn diff -r PREV:HEAD --internal-diff > patchfile > > and then the patchfile could be

Re: [Rd] Why R should never move to git

On 24/01/2018 7:04 PM, Gábor Csárdi wrote: You need to create a branch from the original master, if you do git log master then you'll see which commit that is: f735449d679686867e7d3ab70810b09e8cea6366 So create that branch off that and switch to the new branch: git branch keepclassx

Re: [Rd] Why R should never move to git

You need to create a branch from the original master, if you do git log master then you'll see which commit that is: f735449d679686867e7d3ab70810b09e8cea6366 So create that branch off that and switch to the new branch: git branch keepclassx f735449d679686867e7d3ab70810b09e8cea6366 git checkout

Re: [Rd] Why R should never move to git

On 24/01/2018 6:35 PM, Gábor Csárdi wrote: When you create a branch for your bug fix, don't create it off the previous fix. Create it off the original, forked state of the repo. Branches keepclass2 through to keepclass5 are my attempts to do that. As far as I can see they are all the same as

Re: [Rd] Why R should never move to git

I think the problem you're experiencing is not uncommon but has a solution. FWIW, I prefer git, but I think the best version control system for R is whatever R-core prefers. If they were 2% more productive working in an MS Word documents with Track Changes than git, so much worse for git. On 25

Re: [Rd] Why R should never move to git

When you create a branch for your bug fix, don't create it off the previous fix. Create it off the original, forked state of the repo. Are the two commits here your fixes? https://github.com/dmurdoch/manipulateWidget/commits/master Gabor On Wed, Jan 24, 2018 at 11:17 PM, Duncan Murdoch

[Rd] Why R should never move to git

Lately I've been doing some work with the manipulateWidget package, which lives on Github at https://github.com/rte-antares-rpackage/manipulateWidget/. Last week I found a bug, so being a good community member, I put together a patch. Since the package lives on Github, I followed