Talk:Using Git - Revision history

Gwyneth Llewelyn: /* Git Roadmap */ new section

2024-05-31T18:52:09Z

‎Git Roadmap: new section

Tampa at 17:03, 15 August 2023

2023-08-15T17:03:28Z

Fritigern: /* Not working with my login? */

2011-08-11T18:07:07Z

‎Not working with my login?

Raydlee msc: /* Not working with my login? */

2011-08-11T11:15:09Z

‎Not working with my login?

Fritigern: /* Not working with my login? */

2011-08-10T10:35:09Z

‎Not working with my login?

Raydlee msc: /* Not working with my login? */ new section

2011-08-10T05:33:53Z

‎Not working with my login?: new section

WhiteStar: cleaned up previously posted material as not posted to to main using git pages

2009-09-17T16:52:09Z

cleaned up previously posted material as not posted to to main using git pages

WhiteStar at 01:41, 14 September 2009

2009-09-14T01:41:13Z

WhiteStar at 17:56, 13 September 2009

2009-09-13T17:56:12Z

WhiteStar at 17:51, 13 September 2009

2009-09-13T17:51:28Z

← Older revision		Revision as of 18:52, 31 May 2024
Line 20:		Line 20:
	https://github.com/gitextensions/gitextensions/releases/tag/v3.5.4		https://github.com/gitextensions/gitextensions/releases/tag/v3.5.4
	-Tampa		-Tampa
		+
		+	== Git Roadmap ==
		+
		+	Hi all,
		+
		+	I'm aware that the transition to a self-hosted Git repository has occurred over a decade ago, and I seriously omment you guys for doing so.
		+
		+	However, I admit that I'm spoiled by the functionality of modern, open, public repositories (GitHub comes to mind, but there are obviously more). Not to mention that with such tools it would be far easier to do issue tracking + code submission + CI, all in the same platform... but anyway! That's an issue for the Core Devs to discuss! Do you want to enter the modern age of collaborative coding of the 2020s, or should we remain stuck with something from the generation before, which does work well, and has served te community for so long? ''You'' decide!
		+
		+	My point was actually something funny that I only noticed yesterday.
		+
		+	I saw somewhere that [[User:Ubit Umarov\|Ubit]] had been submitting more code, so, as usually, since I love to live dangerously on my "bleeding edge" OpenSim grid (the theory being: if things break, I'll be the first to know!). I did the usual <code>git pull</code>, and, as it has been the case for several months, Git told me that the repo was <code>Already up to date</code>, which it has been fond of saying.
		+
		+	I was going to dismiss the issue further — if it's up to date, it's up to date, Git ''knows'' what it's doing, right? — until I noticed a slight discrepancy in the versions, when doing some Hypergrid jumps. Why was "my" grid running on 0.9.2.2 while the destination grid was on Nessie, 0.9.3? That was weird! I wondered — was there an even-more-bleeding-edge version I didn't know about?
		+
		+	As it happens, I got too excited with Microsoft's Rosalyn compiler for non-Windows platforms, and once Ubit released an "experimental" release that does not rely upon Mono any longer (hooray!), I immediately switched to it — branch <code>dotnet6</code>. Things worked exemplarily well for a while. Then, as said, there were no more updates, and I was fine with "no news is good news".
		+
		+	While compiling a new version of a LibreMetaverse project I'm doing (very very slowly), I noticed, however, that .NET 6 was, for all purposes, deprecated. Current version (at the time of writing!) is 8, not 6, and 9 is out in Preview. So I was seriously behind the latest & greatest technologies — even though I thought I had switched to the bleeding edge-iest branch?...
		+
		+	Well, that was true a couple years ago or so. Then non-Mono .NET compilation became, in fact, the ''official'' main branch. And, as expected, that was getting the latest updates — not an "experimental" branch from ages ago.
		+
		+	Which makes a lot of sense. I was just ignorant, I should have checked all the branches, to see which ones are being kept up to date... but wait... how many branches ''are'' there?!
		+
		+	As it turns out... there are dozens and dozens and dozens! Most have obscure names from the developers who created the branch, and with next-to-zero information about what that specific branch is supposed to ''do''. Which is '''not''' surprising: in many scenarios, these are just Pull Requests, which have been discussed on the Mantis, and then the branches were merged, after due testing. To keep track of them all... you have to keep track of ''all'' issues on Mantis. Which, obviously, ''I'' don't, so I totally missed this...
		+
		+	That's "not a problem" — Git is ''designed'' to deal with dozens, hundreds of branches, and I understand that this is exactly what Linus Torvalds does for the Linux kernel development. But, alas, I'm no Linus :) and I lack the ability to figure out what branch does what — because, well, the official repository doesn't have a nice, cool Web interface!
		+
		+	Now, I don't want to enter into the "repository wars" — they're a waste of time — and I think that we can live with what we have (after all, it's what has kept the code up to date!). Nevertheless, please consider ''pruning'' the branch tree to something more manageable. I'm not saying that we ''only'' need a "main" branch and a "dev" branch; OpenSimulator is probably too complex for such a simplistic organisation. I'm just saying that "old" branches — which have been merged or abandoned eons ago — should be pruned from the active tree. It's possible to consider having an archive facility for historic purposes (although, technically spaking, the main branch has all the history already...). But the branches receiving ongoing contributions — experimental or final! — should be the only ones "active", so to speak.
		+
		+	Needless to say, that this is the whole reason why sites such as GitHub exist. Visually it's very easy to see everything at a glance, and even drop some notes here and there in order to ''know'' what each branch was supposed to be for, and which ones are being actively pursued. GitHub/GitLab/Bitbucket/Gogs/Gitea and many, many other platforms have been designed to make all that housekeeping work easy.
		+
		+	That said...
		+
		+	After switching from the <code>dotnet6</code> branch to the main one, I had zero issues in compiling everything under .NET 8 — it worked almost flawlessly (I had to delete some deprecated DLLs which were still around for some stupid reason and which were "confusing" the OpenSim executable when loading all existing modules...) and I'm closely watching our mini-grid for performance issues. So far, everything looks awesome :)
		+
		+	Cheers and thanks in advance,
		+
		+	— [[User:Gwyneth Llewelyn\|Gwyneth Llewelyn]] ([[User talk:Gwyneth Llewelyn\|talk]]) 11:52, 31 May 2024 (PDT)

← Older revision		Revision as of 17:03, 15 August 2023
Line 15:		Line 15:
	: I will look into this.		: I will look into this.
	: --[[User:Fritigern\|Fritigern]] 18:07, 11 August 2011 (UTC)		: --[[User:Fritigern\|Fritigern]] 18:07, 11 August 2011 (UTC)
		+
		+
		+	Definitely worth including Git Extensions for gui on Windows. By far the best option I have found, although only before the .net update happened, cause developers love their dark mode :)
		+	https://github.com/gitextensions/gitextensions/releases/tag/v3.5.4
		+	-Tampa

← Older revision		Revision as of 18:07, 11 August 2011
Line 11:		Line 11:

	Almost - I was using the non-core, but I hadn't noticed the copy-paste had changed the "git://" header to "ssh://" - changed this back and now pulling ok.		Almost - I was using the non-core, but I hadn't noticed the copy-paste had changed the "git://" header to "ssh://" - changed this back and now pulling ok.
		+
		+	: I do think that this article could do with a good rewrite to restructure it, so that stuff for non-developers are grouped together, and the stuff for developers are grouped together.
		+	: I will look into this.
		+	: --[[User:Fritigern\|Fritigern]] 18:07, 11 August 2011 (UTC)

← Older revision		Revision as of 11:15, 11 August 2011
Line 9:		Line 9:
	: I think you are using the methid for core developers. Look under [[Using_Git#Cloning_the_Repositry_.28for_Non_Core_Developers.29]], this should work without asking for a password.		: I think you are using the methid for core developers. Look under [[Using_Git#Cloning_the_Repositry_.28for_Non_Core_Developers.29]], this should work without asking for a password.
	: --[[User:Fritigern\|Fritigern]] 10:35, 10 August 2011 (UTC)		: --[[User:Fritigern\|Fritigern]] 10:35, 10 August 2011 (UTC)
		+
		+	Almost - I was using the non-core, but I hadn't noticed the copy-paste had changed the "git://" header to "ssh://" - changed this back and now pulling ok.

← Older revision		Revision as of 10:35, 10 August 2011
Line 6:		Line 6:

	Ray		Ray
		+
		+	: I think you are using the methid for core developers. Look under [[Using_Git#Cloning_the_Repositry_.28for_Non_Core_Developers.29]], this should work without asking for a password.
		+	: --[[User:Fritigern\|Fritigern]] 10:35, 10 August 2011 (UTC)

← Older revision		Revision as of 05:33, 10 August 2011
Line 1:		Line 1:
	Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)		Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)
		+
		+	== Not working with my login? ==
		+
		+	I'm trying an initial git clone (want to try and compile with bulletsim) - but can't login with windows git. Keeps asking for the password and then invallidating the password - problem?
		+
		+	Ray

← Older revision		Revision as of 16:52, 17 September 2009
Line 1:		Line 1:
	Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)		Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)
−
−
−	~~'''HOW-TO Create GIT# - r# DATESTAMP for OpenSim'''~~
−
−	~~This creates the bin/.version file which contains a sting tlike this: fe4f312 - r10694 2009-09-13 07:28:08 -0400~~
−
−
−	~~'''''WINDOWS:'''''~~
−
−	~~CREATE a BATCH File called '''GIT_ver.bat '''on your desktop. ~~
−
−	~~COPY the contents as shown below into it and save the file.~~
−
−	~~INSTRUCTIONS are explained in the batch file.  You will have to create a text file '''"revtag.sh"''' and insert the command line as shown in the header of the batchfile.~~
−
−	~~Good Luck and Enjoy have your GIT# & R# displayed in your OpenSim Server & Client~~
−	~~<blockquote>~~
−	@echo off<br>::<br>:: FILENAME: GIT_Ver.bat<br>:: AUTHOR: WhiteStar Magic @ OSGrid<br>:: DATE: September.13.2009<br>:: REVISION: 0.1 (initial release)<br>::<br>:: DESCRIPTION: <br>:: - GENERATES Git# & Revision Stamp for Opensim.<br>:: - creates the .version file in the /bin directory<br>:: <br>::<br>:: INSTALLATION:<br>:: - place this on your desktop for easy access<br>:: - ensure that you have the CORRECT LOCATION defined in the OS_GIT_REPO vaiable below.<br>:: !!! Example Structure as I use it. <br>:: C:\OpenSim_GIT <--- Top Directory where the SH file is created<br>:: C:\OpenSim_GIT\bin <--- where the bin directory is located<br>:: !!! This must run from the ONE directory above where \bin is located !!!<br>:: - CREATE A TEXT FILE called revtag.sh in your OS_GIT_REPO<br>:: -- Place this following line EXACTLY into it.<br>:: echo `git show-ref --tags \| tail -1 \| sed -e 's,^\(.......\).*/,\1 - r,'` `git log -n 1 --pretty='format:%ci'` > bin/.version <br>::<br>:: DEPENDENCIES:<br>:: - Installation of GIT TOOLS Windows Installation as per http://opensimulator.org/wiki/Using_Git<br>:: !! I installed these two packages as recomended and used the default installations for them<br>:: - http://msysgit.googlecode.com/files/Git-1.6.4-preview20090730.exe<br>:: - http://code.google.com/p/tortoisegit/<br>::<br>:: ==== SET YOUR GIT REPO HERE ====<br>set OS_GIT_REPO=c:\OpenSim_GIT<br>:: ================================<br>:: Appending Path to access all binaries used by GIT<br>::<br>PATH = C:\Program Files\Git\bin;%PATH%; <br>echo %PATH%<br>::<br>@echo on<br>cd %OS_GIT_REPO%<br>::<br>sh.exe revtag.sh
−	~~</blockquote>~~

← Older revision		Revision as of 01:41, 14 September 2009
Line 3:		Line 3:

	'''HOW-TO Create GIT# - r# DATESTAMP for OpenSim'''		'''HOW-TO Create GIT# - r# DATESTAMP for OpenSim'''
		+
		+	This creates the bin/.version file which contains a sting tlike this: fe4f312 - r10694 2009-09-13 07:28:08 -0400
		+

	'''''WINDOWS:'''''		'''''WINDOWS:'''''

@@ Line 10: / Line 10: @@
 COPY&nbsp;the contents as shown below into it and save the file.
-INSTRUCTIONS&nbsp;are explained in <span style="background-color: navy; color: white" />the header of <span style="background-color: navy; color: white" />the batch file.&nbsp; You will have to create a text file '''"revtag.sh"''' and insert <span style="background-color: navy; color: white" />the command line as shown in <span style="background-color: navy; color: white" />the header of <span style="background-color: navy; color: white" />the batchfile.
+INSTRUCTIONS&nbsp;are explained in the batch file.&nbsp; You will have to create a text file '''"revtag.sh"''' and insert the command line as shown in the header of the batchfile.
 Good Luck and Enjoy have your GIT# &amp; R# displayed in your OpenSim Server &amp; Client

← Older revision		Revision as of 17:51, 13 September 2009
Line 1:		Line 1:
	Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)		Anyone use [http://sourceforge.net/projects/gitextensions/ Git Extensions] for Windows? Supposedly integrates with Windows Explorer. Haven't used it myself, though, but thought I'd mention it for anyone seeking alternatives. --[[User:DaveCoyle\|DaveCoyle]] 02:03, 5 August 2009 (UTC)
		+
		+
		+	'''HOW-TO Create GIT# - r# DATESTAMP for OpenSim'''
		+
		+	'''''WINDOWS:'''''
		+
		+	CREATE a BATCH File called '''GIT_ver.bat '''on your desktop.
		+
		+	COPY the contents as shown below into it and save the file.
		+
		+	INSTRUCTIONS are explained in <span style="background-color: navy; color: white" />the header of <span style="background-color: navy; color: white" />the batch file.  You will have to create a text file '''"revtag.sh"''' and insert <span style="background-color: navy; color: white" />the command line as shown in <span style="background-color: navy; color: white" />the header of <span style="background-color: navy; color: white" />the batchfile.
		+
		+	Good Luck and Enjoy have your GIT# & R# displayed in your OpenSim Server & Client
		+	<blockquote>
		+	@echo off<br>::<br>:: FILENAME: GIT_Ver.bat<br>:: AUTHOR: WhiteStar Magic @ OSGrid<br>:: DATE: September.13.2009<br>:: REVISION: 0.1 (initial release)<br>::<br>:: DESCRIPTION: <br>:: - GENERATES Git# & Revision Stamp for Opensim.<br>:: - creates the .version file in the /bin directory<br>:: <br>::<br>:: INSTALLATION:<br>:: - place this on your desktop for easy access<br>:: - ensure that you have the CORRECT LOCATION defined in the OS_GIT_REPO vaiable below.<br>:: !!! Example Structure as I use it. <br>:: C:\OpenSim_GIT <--- Top Directory where the SH file is created<br>:: C:\OpenSim_GIT\bin <--- where the bin directory is located<br>:: !!! This must run from the ONE directory above where \bin is located !!!<br>:: - CREATE A TEXT FILE called revtag.sh in your OS_GIT_REPO<br>:: -- Place this following line EXACTLY into it.<br>:: echo `git show-ref --tags \| tail -1 \| sed -e 's,^\(.......\).*/,\1 - r,'` `git log -n 1 --pretty='format:%ci'` > bin/.version <br>::<br>:: DEPENDENCIES:<br>:: - Installation of GIT TOOLS Windows Installation as per http://opensimulator.org/wiki/Using_Git<br>:: !! I installed these two packages as recomended and used the default installations for them<br>:: - http://msysgit.googlecode.com/files/Git-1.6.4-preview20090730.exe<br>:: - http://code.google.com/p/tortoisegit/<br>::<br>:: ==== SET YOUR GIT REPO HERE ====<br>set OS_GIT_REPO=c:\OpenSim_GIT<br>:: ================================<br>:: Appending Path to access all binaries used by GIT<br>::<br>PATH = C:\Program Files\Git\bin;%PATH%; <br>echo %PATH%<br>::<br>@echo on<br>cd %OS_GIT_REPO%<br>::<br>sh.exe revtag.sh
		+	</blockquote>