GitLab/GitHub

06 Feb 2020 08:30 #44892 by ScottBouch
Replied by ScottBouch on topic GitHub

What was wrong with the existing Git stuff Alex had set up ?
I dont use it, never will, but I need to ask the question ?


It meant cloning the entire FGUK/Development directory (~4GB) to your local machine, which is a bit excessive for slow internet connections and limited HDD space when you're working on just one aircraft. IT was a limitation of Git, you can't do partial clones of specific directories.

Cheers, Scott.

Please Log in or Create an account to join the conversation.

06 Feb 2020 08:34 #44893 by ScottBouch
Replied by ScottBouch on topic GitHub
One thing I have noticed is that somewhere along the way we've lost the peoples names from the splash screen, it think someone had fixed an issue with set.xml but maybe that fix got lost.

Please Log in or Create an account to join the conversation.

06 Feb 2020 08:34 #44894 by Algernon
Replied by Algernon on topic GitHub
That's not the issue, I think, Scott - I think the issue is, we were expecting to split our existing repository, not create a new one. Was there a particular reason for creating a new repo?

Please Log in or Create an account to join the conversation.

06 Feb 2020 10:11 #44900 by Richard
Replied by Richard on topic GitHub

What was wrong with the existing Git stuff Alex had set up ?
I dont use it, never will, but I need to ask the question ?


As discussed in this thread above with a consensus in #44867.

The reason for using a repository per aircraft is it removes the need to clone a huge repository (4.4gb and growing) but also to allow us to open up development to more folk and grant permissions on a per aircraft basis.

The original idea of using a single repository was to replace the cloud but the problem is the clone times can be long.

If you, or anyone else objects to having a single repository per aircraft then we can open up the discussion again.

Please Log in or Create an account to join the conversation.

06 Feb 2020 10:14 #44901 by Richard
Replied by Richard on topic GitHub

That's not the issue, I think, Scott - I think the issue is, we were expecting to split our existing repository, not create a new one. Was there a particular reason for creating a new repo?


I'm not understanding what you meant by splitting the repository sorry,

Did you expect theer would simply be a new repository in gitlab.com/FGUK - if so then I can easily do this now.

If not that then tell me what you exactly thought and we can figure out how to do it.

Please Log in or Create an account to join the conversation.

06 Feb 2020 10:17 #44902 by enrogue
Replied by enrogue on topic GitHub
my git-fu is not as powerful as richard but as far as I know, splitting a repository up is actually creating new ones out of subdirectories:

help.github.com/en/github/using-git/spli...nto-a-new-repository

it's github but the instructions are actually local git command line, you would just have to susbtitute the github create for gitlab etc

Please Log in or Create an account to join the conversation.

06 Feb 2020 10:22 - 06 Feb 2020 10:23 #44903 by Richard
Replied by Richard on topic GitHub

...maybe that fix got lost.


I've just checked and the two trees are identical so nothing (that had been committed) got lost

Please Log in or Create an account to join the conversation.

06 Feb 2020 10:23 #44904 by Algernon
Replied by Algernon on topic GitHub
Sorry for the misunderstanding Richard.

Did you expect theer would simply be a new repository in gitlab.com/FGUK - if so then I can easily do this now.


Yeah, I think this is what we were thinking. Alex and I were talking about tidying up the existing repository in some way, and I thought the way to go, following the discussion above, was to create a repository for each of those aircraft, but in gitlab.com/FGUK. The exact structure probably warrants a bit more discussion.

Please Log in or Create an account to join the conversation.

06 Feb 2020 11:07 #44906 by Richard
Replied by Richard on topic GitHub

...create a repository for each of those aircraft, but in gitlab.com/FGUK. The exact structure probably warrants a bit more discussion.


Moving an entire repository to a different location is usually easy. Splitting a repository is a little harder; but either way let's have the discussion and find a way forwards.

Please Log in or Create an account to join the conversation.

06 Feb 2020 11:15 #44907 by Algernon
Replied by Algernon on topic GitHub
Alex and I were just experimenting and it looks like we were able to create new repositories for each aircraft under active development and push up the most recent versions... and I feel like I learned a little bit more about Git, which is always nice!

Check it out and see what you think.

Please Log in or Create an account to join the conversation.

06 Feb 2020 11:23 #44908 by Richard
Replied by Richard on topic GitHub
Yup that's fine - but pushing a repo as new loses the history - so I'd prefer to split them out.

Also we could create a subgroup (I've made an example here gitlab.com/FGUK/aircraft) and then push the active repositories into there.

The most important thing for me is to not lose the history

Please Log in or Create an account to join the conversation.

06 Feb 2020 11:42 #44909 by Algernon
Replied by Algernon on topic GitHub
I was wondering about subgroups... and yes, point taken about the histories - something I'm still getting across, even though I guess that's the whole point of Git (or at least a major point).

Could you perhaps demo how a subgroup would work so we can see if it suits our requirements? GitLab says it works like a folder - if that's the case, if it's just a way of organising repos into an aircraft "folder" or subgroup, that's pretty much what I'm after - what do the other admins say?

Please Log in or Create an account to join the conversation.

07 Feb 2020 00:51 #44914 by Richard
Replied by Richard on topic GitHub
I've setup gitlab.com/FGUK/aircraft and put two repositories into it.

Basically a subgroup is just a collection of repositories (or projects as gitlab calls them) - and I think this is probably the way we should do it.
The following user(s) said Thank You: Algernon

Please Log in or Create an account to join the conversation.

07 Feb 2020 12:53 #44920 by Algernon
Replied by Algernon on topic GitHub
Yep, I already said to Alex I thought subgroups might be the answer to the slight organisational issue that was triggering my obsessive-compulsive tendencies. Thanks!

Please Log in or Create an account to join the conversation.

07 Feb 2020 14:11 - 07 Feb 2020 14:11 #44928 by Algernon
Replied by Algernon on topic GitHub
So I noticed the Lightning repo in the new subgroup is called EE-Lightning-2 - is this because of the existing EE-Lightning repo outside of the subgroup?

I'm personally happy with the subgroup solution - if everybody else is, can we then get rid of the -2? Speak now or forever you know what...

Please Log in or Create an account to join the conversation.

07 Feb 2020 23:57 #44950 by Richard
Replied by Richard on topic GitHub
The -2 is just something that I added to ensure that there was no confusion between the repositories; if we're going this way then I'll ensure that the repository is in the right place with the right name - and afterwards everyone will need to update their origins to point at this.

triggering my obsessive-compulsive tendencies.

I think git is good for anyone who is possibly obsessive-compulsive or alternatively is very attentive to detail and likes to develop in an ordered manner. Not using git makes me personally feel like I'm descending into the throes of impending chaos.

Not using version control for any development is chaos waiting to happen.

Please Log in or Create an account to join the conversation.

08 Feb 2020 01:32 #44951 by Algernon
Replied by Algernon on topic GitHub
I think this is the way we're going to go. It seems there is support for individual repositories per aircraft - no dissent was heard, I believe - and organising with subgroups looks ideal to me.

I think the latest, most up-to-date Lightning is the one outside of the subgroup - so can that be the one that goes in the right place (in the subgroup) with the right name (the name it has now) and the right case (as discussed in the other thread)? That would be ideal :)

Please Log in or Create an account to join the conversation.

08 Feb 2020 14:17 #44959 by Richard
Replied by Richard on topic GitHub
Ok I've moved the new repository that you uploaded into Aircraft - however this doesn't have the history that was previously in the cloud.

Do you want me to recover this history or just leave it as it was?

For reference this is the history that is missing
Update LightningV0.2B.README
Transformers & Inverters Added
Merge branch 'patch-6' into 'master'
Merge branch 'patch-7' into 'master'
Changed SOME inacc SWP to AWP
Delete .gitkeep
Update punch.list
Add new file
Add new directory
Fixed animations for Aux/Standard issue
Update warnings.nas
Replace warnings.nas
Upload New File
Update warnings.nas
Merge branch 'patch-3' into 'master'
Replace LightningV0.2B.README
Replace warnings.nas
Update controls.nas
Merge branch 'master' of https://gitlab.com/FGUK/Development
controls.nas and warnings.nas updated
fix filename reference
Replaced entire directory
T5 Splash Screen Added
SWP added
Added controls Nasal file and throttle unit XML
Merge from last cloud (that I had)
Lightning F6 - remove MP sound
Initial version from the cloud.

Please Log in or Create an account to join the conversation.

08 Feb 2020 15:55 #44961 by Algernon
Replied by Algernon on topic GitHub
Thanks for that. I'm quite happy to leave it as it was, as I don't think it's likely we'll want to go back on any of those changes. I do plan to do a significant clean up on the aircraft before a) this current version is alpha released, and b) the major redevelopment branch is created so I'm happy to start the history from this point.

Please Log in or Create an account to join the conversation.

Time to create page: 0.251 seconds
Powered by Kunena Forum

Latest Forum Posts

PM Notifications

You are not logged in.

PM Mailbox

You are not logged in.