Talk:FlightGear Git: data developers: Difference between revisions

From FlightGear wiki
Jump to navigation Jump to search
(Suggested Upstream section)
 
(Moved considerations over FGData over BitTorrent)
 
(6 intermediate revisions by 2 users not shown)
Line 1: Line 1:
== Suggested Upstream section==
== Suggested Upstream section==
As i found out when i followed these well-written instruction, if i had to sync my repository to final FGData to absolve conflicts in files modified and allow fast forwarding for the devs to merge easily.
As i found out after i followed these well-written instruction, if i had to sync from the project's "next" to absolve conflicts and allow fast forwarding for the devs to merge easily.


I found a way that you can add a new remote to pull from and sync your next to.
I found a way that you can add a new remote to pull from and sync your feature branch to. while preserving your "next" state.


<code>git remote add upstream git://git.code.sf.net/p/flightgear/fgdata</code>
<code>git remote add upstream git://git.code.sf.net/p/flightgear/fgdata</code>
Line 15: Line 15:
<code>git fetch upstream</code>
<code>git fetch upstream</code>


<code>git merge upstream/master</code>
<code>git merge upstream/next</code>


what do you think? -[[User:Hamzaalloush|Hamzaalloush]] ([[User talk:Hamzaalloush|talk]]) 16:13, 24 March 2015 (EDT)
what do you think? -[[User:Hamzaalloush|Hamzaalloush]] ([[User talk:Hamzaalloush|talk]]) 16:13, 24 March 2015 (EDT)
: Sounds good - I'll make sure to include it in the Git article refactoring I'm currently doing. -- [[User:Elgaton|ElGaton]] ([[User talk:Elgaton|<tt>talk</tt> to me]]) 16:09, 6 May 2016 (EDT)
== Considerations over downloading FGData using BitTorrent ==
Some considerations of [[User:Callahanp|Callahanp]] moved from [[Talk:Downloading fgdata using bittorrent]]:
* BitTorrent is a solution or partial solution to hosting service resource issues.
* There may be other solutions.
===Fgdata facts as of 28-Apr-2016===
'''1. the current fgdata can be downloaded without history using git:
'''
git clone --depth=1 git://git.code.sf.net/p/flightgear/fgdata/
Cloning into 'fgdata'...
remote: Counting objects: 10965, done.
remote: Compressing objects: 100% (8184/8184), done.
remote: Total 10965 (delta 2327), reused 9311 (delta 1918)
Receiving objects: 100% (10965/10965), 1.07 GiB | 6.92 MiB/s, done.
Resolving deltas: 100% (2327/2327), done.
Checking connectivity... done.
Checking out files: 100% (10360/10360), done.
* this 1.07 GiB download results in 2.9GiB fgdata directory
* the size of the .git file in the fgdata direcory is 1.2 GiB
* the checked out files in fgdata total 1.7 gb
* change history is not included in the local .git file because of the depth=1 option
'''2. the current fgdata can be downloaded with history using git:
'''
git clone  git://git.code.sf.net/p/flightgear/fgdata/
flightgear/fgdata/Cloning into 'fgdata'...
remote: Counting objects: 52568, done.
remote: Compressing objects: 100% (23896/23896), done.
remote: Total 52568 (delta 29439), reused 49244 (delta 27278)
Receiving objects: 100% (52568/52568), 1.95 GiB | 6.92 MiB/s, done.
Resolving deltas: 100% (29439/29439), done.
Checking connectivity... done.
Checking out files: 100% (10360/10360), done.
* this 1.95 GiB download results in 3.8 GiB fgdata directory
* the size of the .git file in the fgdata direcory is 2.1 GiB
* the checked out files in fgdata total 1.7 gb, just as before
* change history is included in the local .git in this case
this results in a 2.1 GB .git file in the fgdata directory. fgdata's total is then 3.8 GB
===Bittorrent for flightgear data.===
* May or may not be needed at this point in time
* Should be discussed on the development mailing list before proceeding
* Would best be accomplished by or in cooperation with the developers
===Possible flightgear server options (quite stale) ===
On 02/05/14 17:54, Stefan Seifert wrote:
I can offer a server located in Germany with 10 TB of traffic
per month and plenty of disk space, both of which I hardly use
anything.
On 18/04/14 08:34, James Turner wrote:
I can host a fairly large SVN repo on my DreamHost  (many GBs)
===Routines and services we'll need to build or install===
# Create .git bundles from .git or .gits
# Monitor bittorrent and other services and providers hosting fgdata bundles
# Maintain torrent data on the servers
# Ensure compliance with server bandwidth limitations
-- [[User:Elgaton|ElGaton]] ([[User talk:Elgaton|<tt>talk</tt> to me]]) 16:13, 6 May 2016 (EDT)

Latest revision as of 20:13, 6 May 2016

Suggested Upstream section

As i found out after i followed these well-written instruction, if i had to sync from the project's "next" to absolve conflicts and allow fast forwarding for the devs to merge easily.

I found a way that you can add a new remote to pull from and sync your feature branch to. while preserving your "next" state.

git remote add upstream git://git.code.sf.net/p/flightgear/fgdata

check out to next and create your feature branch, i.e:

git checkout next git checkout -b reflect-shader

fetch and merge the "upstream" remote into your feature branch:

git fetch upstream

git merge upstream/next

what do you think? -Hamzaalloush (talk) 16:13, 24 March 2015 (EDT)

Sounds good - I'll make sure to include it in the Git article refactoring I'm currently doing. -- ElGaton (talk to me) 16:09, 6 May 2016 (EDT)

Considerations over downloading FGData using BitTorrent

Some considerations of Callahanp moved from Talk:Downloading fgdata using bittorrent:

  • BitTorrent is a solution or partial solution to hosting service resource issues.
  • There may be other solutions.

Fgdata facts as of 28-Apr-2016

1. the current fgdata can be downloaded without history using git:

git clone --depth=1 git://git.code.sf.net/p/flightgear/fgdata/

Cloning into 'fgdata'...
remote: Counting objects: 10965, done.
remote: Compressing objects: 100% (8184/8184), done.
remote: Total 10965 (delta 2327), reused 9311 (delta 1918)
Receiving objects: 100% (10965/10965), 1.07 GiB | 6.92 MiB/s, done.
Resolving deltas: 100% (2327/2327), done.
Checking connectivity... done.
Checking out files: 100% (10360/10360), done.
  • this 1.07 GiB download results in 2.9GiB fgdata directory
  • the size of the .git file in the fgdata direcory is 1.2 GiB
  • the checked out files in fgdata total 1.7 gb
  • change history is not included in the local .git file because of the depth=1 option

2. the current fgdata can be downloaded with history using git:

git clone  git://git.code.sf.net/p/flightgear/fgdata/
flightgear/fgdata/Cloning into 'fgdata'...
remote: Counting objects: 52568, done.
remote: Compressing objects: 100% (23896/23896), done.
remote: Total 52568 (delta 29439), reused 49244 (delta 27278)
Receiving objects: 100% (52568/52568), 1.95 GiB | 6.92 MiB/s, done.
Resolving deltas: 100% (29439/29439), done.
Checking connectivity... done.
Checking out files: 100% (10360/10360), done.
  • this 1.95 GiB download results in 3.8 GiB fgdata directory
  • the size of the .git file in the fgdata direcory is 2.1 GiB
  • the checked out files in fgdata total 1.7 gb, just as before
  • change history is included in the local .git in this case

this results in a 2.1 GB .git file in the fgdata directory. fgdata's total is then 3.8 GB

Bittorrent for flightgear data.

  • May or may not be needed at this point in time
  • Should be discussed on the development mailing list before proceeding
  • Would best be accomplished by or in cooperation with the developers

Possible flightgear server options (quite stale)

On 02/05/14 17:54, Stefan Seifert wrote:

I can offer a server located in Germany with 10 TB of traffic per month and plenty of disk space, both of which I hardly use anything.

On 18/04/14 08:34, James Turner wrote:

I can host a fairly large SVN repo on my DreamHost (many GBs)


Routines and services we'll need to build or install

  1. Create .git bundles from .git or .gits
  2. Monitor bittorrent and other services and providers hosting fgdata bundles
  3. Maintain torrent data on the servers
  4. Ensure compliance with server bandwidth limitations

-- ElGaton (talk to me) 16:13, 6 May 2016 (EDT)