Move openfire svn to github 31 March

Flow · April 8, 2014, 5:57am

Indeed, those reference didn’t make it over to git.

I think the best way to deal with the situation is create a new maven branch out of the master branch and then commiting the .pom files from the old maven branch into it.

Besides, I plan to convert all non-master branches of the openfire git to tags prefixed with “attic/” as those branches shouldn’t be used because most of them don’t have a shared parent commit with the master branch. So please simply ignore any non-master branch for now and more importantly, don’t commit against them.

Flow · April 8, 2014, 6:16am

After i change something in my local source, how can i revert to the latest official source…So i want to be able to get the latest “revision”, apply a patch, compile, test, revert changes so i can apply the next patch.

That’s actually something git excels at, as it has cheap local branching. So you just create a new branch e.g. ‘testpatch’ based on the current master. Apply the patch, build and test it. After it’s done you can either discard the branch or commit and rebase it on top of master.

Basically this comes down to:

git checkout -b testpatch

git apply ./foo-bar.patch

[build]

[done testing]

git checkout master

the you could either delete the ‘testpatch’ branch

git branch -D testpatch

or apply it’s changes

git rebase testpatch

git branch -d testpatch

wroot · April 8, 2014, 8:15am

Thanks, Jason and Flow. NetBeans shows actual git commands when selecting gui commands, so i will figure out how to achieve what i want. Just need to reajust to this new to me branching workflow.

Dele_Olajide · April 8, 2014, 10:03pm

Daryl, Flow, Jason, CSH, Tom & everyone else,

Thanks for making the transition very smooth and problem free. Thanks for all the git command tips. In the end, I simply used TortoiseGit on Windows with right click on folder to clone, edit, commit and push.

Nice

BigD · April 9, 2014, 6:57pm

Hi,

thanks for the move to github!

Please keep in mind to change the links in the download-section of the openfire sourcecode.

For all developers who use git the first time. Checkout this interactive javascript tutorial: http://pcottle.github.io/learnGitBranching/?demo

It’s really great!

wroot · April 9, 2014, 8:03pm

This is how Pull from Upstream looks in NetBeans (after pressing Search History link):

As you said it is doing fetch + merge. At first i thought only green ones are actually applied to the master.

I think i have found all the equivalents of git commands that i will need for my workflow of testing patches. Pull, create/checkout branch, apply diff patch, clean build, switch to master, delete branch. Though actually for creating a branch it uses another command:

git branch --track test_patch master

Which i found is the same as the -b switch (which combines two commands into one).

Now i have to wait for some new patches to actually try this process out. Tomas Hruska said he will have more patches for Spark this week maybe.

CSH · April 9, 2014, 8:12pm

Btw: As someone who has never worked with git and github before:

It was probably already discussed somewhere, but can somebody explain in a few sentences, what’s the benefit now, i.e. what did the Openfire project gain with the move to git(hub)? Is it the decentralized nature of git?

wroot · April 9, 2014, 8:16pm

As i understand git alone is the convenience of development (branching, etc.), gitHUB is for getting attention from other developers.

akrherz · April 9, 2014, 8:31pm

CSH,

There are two things going on here.

The switch to GIT over subversion. This is a no-brainer as “subversion sucks” says Linus.
The switch to github, over hosting our own GIT infrastructure. This is more debatable, but at the end of the day, most of the cool kids are on github and github has many very compelling features and UI to make development easy.

The hope is to make it easier for folks to fork and develop openfire, sending us back pull requests that are easy to merge and move forward with.

daryl

Jason60 · April 9, 2014, 8:56pm

and in spirit - here’s a Google Tech Talk (with Linus) about Git:

It’s worth a watch, even if you already know how great Git is.


I can't resist...

Don't you, Git it?

ahahahahah!

BigD · April 9, 2014, 10:23pm

“Github is facebook for nerds” - Description of github as answer to the question of our management assistant given by a colleague. ;-D

wroot · April 15, 2014, 10:28am

BigD wrote:

Please keep in mind to change the links in the download-section of the openfire sourcecode.

I second that. When people ask about tyhe source, i want to point to the Ignite Realtime: Source Code which should have github links (Openfire and Spark).

akrherz · April 15, 2014, 12:55pm

I’ve added those there now.

wroot · June 10, 2014, 8:50pm

Ok, maybe someone can explain me what’s happening. I’m using NetBeans and i setup a connection to Openfire.git. When i see changes in Fisheye RSS feed i do Pull from Upstream. Usually it goes without issues, i check history and see merges. A few weeks ago i already had an issue and have started from scratch (new Git clone). Now it appears again. It says that i have local modifications and asks to Revert or Review. I’ve already tried Revert last time and it didn’t do any good. I do not modify anything. Why it says i have local modifications?? I just want to have a read only latest code on my disk. If i press Review, it points to .gtignore. I think there was something about it in the latest changes (something about DS_Store files). So if something is removed/ignored in the master, i then have “local modifications”?

This time it seems Revert did help.

Flow · June 11, 2014, 5:57am

Please join open_chat, those kind of issues are usually better handled in a live chat session.

wroot · June 11, 2014, 8:58pm

Well, i’m not an “always connected” person, so i prefer to post on the forum and get to responses (if any) when it is convenient and there is time for this.