Horde3D

Next-Generation Graphics Engine
It is currently 16.12.2018, 11:14

All times are UTC + 1 hour




Post new topic Reply to topic  [ 22 posts ]  Go to page 1, 2  Next
Author Message
PostPosted: 06.09.2013, 16:01 
Offline

Joined: 08.01.2008, 14:57
Posts: 66
I think we should discuss about the VCS and issue management: how could we improve the community feedback on this side?

IMHO, a switch to a Github (or Gitorious, or ...) repo should solve these two issues in one move: giving a more collaborative infrastructure to contribute to the code base and a solid issue management platform, for free.

About the eternal SVN vs Git problem, well, before I also didn't like Git, but now I find it very successful in open projects following this kind of working model:

http://nvie.com/posts/a-successful-git-branching-model/


Last edited by Zuck on 16.09.2013, 10:17, edited 1 time in total.

Top
 Profile  
Reply with quote  
PostPosted: 06.09.2013, 17:45 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
Well, I have no doubt git is a great thing in theory, but usability is IMHO a pain in the ass. But Ok, I consider myself still young, so let's try something new:
Here we go: https://github.com/Volki21/Horde3D/tree/develop

Maybe I should have choosen a more official user name, but we might change that later too, since I won't publish any news about a new official git repository until I have merged at least one community pull request by using git.


Top
 Profile  
Reply with quote  
PostPosted: 06.09.2013, 18:22 
Offline

Joined: 21.08.2008, 11:44
Posts: 354
@ Volker and attila

One of you guys should fork other ones repository, so other one can easily pull changes from other one or issue pull requests. I don't know, you two should discuss it.


Top
 Profile  
Reply with quote  
PostPosted: 06.09.2013, 20:36 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
I thought I may be able to create a new feature branch, that tracks the git repo from attila. I found some documentation how that may be possible under
http://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another and http://stackoverflow.com/questions/1184518/getting-existing-git-branches-to-track-remote-branches, but couldn't find out, how that may be realized on GitHub.


Top
 Profile  
Reply with quote  
PostPosted: 07.09.2013, 07:43 
Offline

Joined: 26.08.2008, 18:48
Posts: 120
Siavash wrote:
@ Volker and attila

One of you guys should fork other ones repository, so other one can easily pull changes from other one or issue pull requests. I don't know, you two should discuss it.


I will fork Volker's official github repository ( and add a gles_d3d11 branch there). I have added a link in attila/Horde3D/read to the official repo. Possibly attila/horde3d-x should be removed in the future to avoid confusion.


Top
 Profile  
Reply with quote  
PostPosted: 07.09.2013, 10:15 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
Alright thanks attila. Makes things much simpler for me :-)


Top
 Profile  
Reply with quote  
PostPosted: 13.09.2013, 01:10 
Offline

Joined: 09.02.2012, 22:38
Posts: 26
Volker wrote:
Well, I have no doubt git is a great thing in theory, but usability is IMHO a pain in the ass.

Start using SourceTree or TortoiseGit or Gitg mixed with a terminal :) The main thing that I had pains with in the beginning is the modified work flow:
git clone = svn checkout
git commit -a -m "Message" = svn commit, but in a local sense!
git pull --rebase (rebase cleans the history by putting local commits "on top") = svn update
git push = upload your changes (aka svn commit ^^) to the main repository

Useful used-once-a-week work flows:
git stash, git stash pop = save your work without committing it, so you can switch branches or pull from the origin repository
git checkout [-b] feature_branch = svn copy/branch, but VERY fast. I use it for any ticket larger than 3-4 commits
git merge feature_branch = svn merge, but again VERY fast

You'd start to like it sooner or later, as it can do things in a snap, where Subversion would drive you crazy (branching, bisecting, cherry picking, ...) ;)

Regards,
Christoph


Top
 Profile  
Reply with quote  
PostPosted: 13.09.2013, 09:22 
Offline

Joined: 09.02.2012, 22:38
Posts: 26
Initial attempt to create a new README.md - the feature list is still too big for my taste. Other than that I like it. A paragraph about versioning should be added (how about SemVer 2.0?).


Top
 Profile  
Reply with quote  
PostPosted: 13.09.2013, 09:58 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
Thanks Christoph. Can you create a pull request for merge into develop branch?

BTW: I renamed my username to a bit more official one. I thought it might be better doing that before more people clone this repo. I hope that does not introduce to much trouble for attila and you when updating your forks.


Top
 Profile  
Reply with quote  
 Post subject: Re: GitHub Repository
PostPosted: 14.09.2013, 15:31 
Offline

Joined: 09.02.2012, 22:38
Posts: 26
Done.

Volker wrote:
BTW: I hope that does not introduce to much trouble for attila and you when updating your forks.

As long as you don't force push there won't be any problems, because each commit has an immutable, unique hash. Git needs to be kernel-developer proof after all ;)

Edit: Shall we move from MediaWiki to GitHub Wiki? Its easier to use, but less powerful (GitHub Markdown vs. WikiCreole).


Top
 Profile  
Reply with quote  
 Post subject: Re: GitHub Repository
PostPosted: 14.09.2013, 21:47 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
Merged it, thanks Christoph.

Regarding the Wiki, I don't want to move to github. Personally I like the style of the wiki pages we have and don't want to add additional work of moving all the stuff to GitHub wiki. Another reason is that the Wiki pages here are easier to manage regarding the user administration, backup, customization etc, as we host it ourselfs and have the link to the phpbb forum software.


Top
 Profile  
Reply with quote  
 Post subject: Re: GitHub Repository
PostPosted: 15.09.2013, 13:29 
Offline

Joined: 08.01.2008, 14:57
Posts: 66
Yeah, I also prefer to stay on MediaWiki (honestly I don't really like it too much due to its forced Wikipedia-style, but in this case it allows more integration with official forum and avoids confusion).


Top
 Profile  
Reply with quote  
 Post subject: Re: GitHub Repository
PostPosted: 16.09.2013, 00:46 
Offline

Joined: 09.02.2012, 22:38
Posts: 26
Ok. An upgrade wouldn't hurt though, as the usability improvements over the last 3 years will simplify things.

I've tried to modernize the Wiki a bit last year (topic), but I failed due to template mess and time passing by :) Reviewing pages will take days and is very non-rewarding, as the Wiki doesn't feel like a first class citizen (mainly due to the homepage and way its integrated).


Top
 Profile  
Reply with quote  
 Post subject: Re: GitHub Repository
PostPosted: 16.09.2013, 09:38 
Offline
Tool Developer

Joined: 13.11.2007, 11:07
Posts: 1149
Location: Germany
You mean an upgrade of the mediawiki version? I can try to update it when I'm at home again.

Regarding Git, I still hate it. I tried merging a pull request into master, but I'm really confused about, merging/cherry-picking/rebase and all this stuff.

I hope the way I did it is not the complete wrong one, and master is now on the same state as develop except the Animation method changes by Zuckk, that I'm still not completly convinced of.

I guess the README.md changes could be also merged into one commit, but I don't have the time to do that all by myself now until I get more familiar with git.


Top
 Profile  
Reply with quote  
PostPosted: 16.09.2013, 10:26 
Offline

Joined: 08.01.2008, 14:57
Posts: 66
I think there's no need to hurry in pulling merge requests.

GitHub offers a good tool for merge discussion, so if we have doubts, we can discuss there and modify the merge to solve all the issues.


Top
 Profile  
Reply with quote  
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 22 posts ]  Go to page 1, 2  Next

All times are UTC + 1 hour


Who is online

Users browsing this forum: No registered users and 4 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
cron
Powered by phpBB® Forum Software © phpBB Group