Forged Alliance Forever

Re: devtalk

2014-09-28T13:39:25+02:00

Ze_PilOt wrote:
This article sums up quite clearly.
http://jhw.dreamwidth.org/1868.html

In a nutshell, mercurial is more flexible when it comes to pulling/pushing from several repositories because of the implicit branching system and the history conservation.

I'm sure got is able to be as efficient, but with more hassle from my experience. When you work with a lot of contributors who are not expert in that domain, mercurial is the better choice.

Thank you.
github try to avoid this problem, because it has a "PullRequest" web overview and shows the forks in a network graph.
But you are right ... You have not the history of the family in the repo ... only on github ...
And that is better ...
I found no way to see the whole repo history ...
https://github.com/FAForever/lobby/network

If you have the right branch model github is fine:
http://nvie.com/posts/a-successful-git-branching-model/

The only advantage from my view:
- bitbucket can reject force pushes
- bitbucket is more customizable
- bitbucket has free private repos

PS.: github is more then git

Statistics: Posted by Dragonfire — 28 Sep 2014, 13:39

Re: devtalk

2014-09-28T13:20:14+02:00

Dragonfire wrote:
Ze_PilOt wrote:Also the branch system of mercurial is more versatile, witch is good for a project with many contributors.

Can you specify that more?
Have you got an example what is not possible with github?

This article sums up quite clearly.
http://jhw.dreamwidth.org/1868.html

In a nutshell, mercurial is more flexible when it comes to pulling/pushing from several repositories because of the implicit branching system and the history conservation.

I'm sure got is able to be as efficient, but with more hassle from my experience. When you work with a lot of contributors who are not expert in that domain, mercurial is the better choice.

Statistics: Posted by Ze_PilOt — 28 Sep 2014, 13:20

Re: devtalk

2014-09-27T19:08:28+02:00

Ze_PilOt wrote:
I'm not planning of switching the code to git sorry.

All the code is under mercurial and the server update system is expecting mercurial.

Also the branch system of mercurial is more versatile, witch is good for a project with many contributors.

Later, if visionik decide that git is better, I don't care, but for the moment it's not an viable option.

Okay we'll get that sorted. In the meantime I'm compiling PR's for patch 3635 on the github repo.

Can you check if the master branch is up-to-date w.r.t. patchlevel 3634?

P.S. the infinite eco exploit-fix is a 1 line removal diff.

Statistics: Posted by Sheeo — 27 Sep 2014, 19:08

Re: devtalk

2014-09-27T19:06:58+02:00

Ze_PilOt wrote:
Also the branch system of mercurial is more versatile, witch is good for a project with many contributors.

Can you specify that more?
Have you got an example what is not possible with github?

Statistics: Posted by Dragonfire — 27 Sep 2014, 19:06

Re: devtalk

2014-09-27T18:59:51+02:00

I'm not planning of switching the code to git sorry.

All the code is under mercurial and the server update system is expecting mercurial.

Also the branch system of mercurial is more versatile, witch is good for a project with many contributors.

Later, if visionik decide that git is better, I don't care, but for the moment it's not an viable option.

Statistics: Posted by Ze_PilOt — 27 Sep 2014, 18:59

Re: devtalk

2014-09-27T18:22:31+02:00

Ze_PilOt wrote:
Would it be possible to do a pull request on bitbucket?

Sure I'll get right on that. I'd prefer it if we can keep development on github in the future, however.

EDIT: Ok so I tried to do a cross-PR, it won't work.

I'm not up for managing changesets between hg and git locally -- so I suggest we just do everything on github.

Statistics: Posted by Sheeo — 27 Sep 2014, 18:22

Re: devtalk

2014-09-27T18:16:26+02:00

Sheeo wrote:
Ze_PilOt wrote:The infinite resource exploit is missing.

I put it into a pull request here: https://github.com/FAForever/fa/pull/6

The underlying branch is fix-5-infinite-eco: https://github.com/FAForever/fa/tree/fix-5-infinite-eco

Would it be possible to do a pull request on bitbucket?

Statistics: Posted by Ze_PilOt — 27 Sep 2014, 18:16

Re: devtalk

2014-09-27T18:15:23+02:00

Dragonfire wrote:
Ze_PilOt wrote:For contributing, I don't think switching to git is the best idea.
First because everything is on it already, and because the branching in mercurial makes more sense for a contribution-oriented project.

I want not start a discussion,
but github can handle it very good

But everything that is currently in place is using mercurial.
Unless there is a good reason to switch, I don't see why we should.

Statistics: Posted by Ze_PilOt — 27 Sep 2014, 18:15

Re: devtalk

2014-09-27T17:46:24+02:00

Ze_PilOt wrote:
The infinite resource exploit is missing.

I put it into a pull request here: https://github.com/FAForever/fa/pull/6

The underlying branch is fix-5-infinite-eco: https://github.com/FAForever/fa/tree/fix-5-infinite-eco

Statistics: Posted by Sheeo — 27 Sep 2014, 17:46

Re: devtalk

2014-09-27T17:41:44+02:00

Ze_PilOt wrote:
For contributing, I don't think switching to git is the best idea.
First because everything is on it already, and because the branching in mercurial makes more sense for a contribution-oriented project.

I want not start a discussion,
but github can handle it very good

Statistics: Posted by Dragonfire — 27 Sep 2014, 17:41

Re: devtalk

2014-09-27T17:33:08+02:00

Sheeo wrote:
Ze_PilOt wrote:
Dragonfire wrote:He moved to github:
https://github.com/FAForever

It is incomplete, miss branches and has a lot of untested and most likely unwanted modifications.

I'm missing one exploit fix.

Right, the repository was created in a rush from the state of bitbucket. I've had to reset --hard and force push it to get the repo to a clean state of what I think is patch level 3634 (Can't find a commit/tag detailing the release).

This means those who forked need to hard reset their branch as well.

What exploit fix is missing? I'm going to split the fixes I know of into fix-xx branches now, will be pushing them as I come along.

The infinite resource exploit is missing.

Statistics: Posted by Ze_PilOt — 27 Sep 2014, 17:33

Re: devtalk

2014-09-27T17:30:01+02:00

Frozen_byte wrote:
Indeed we all should wait about 1 month before doing all the stuff. The Repository is not completed yet and it may have major changes without any warnings.
Also there is still a small conversation about a second (document-based) Database. I guess we can discuss this much more efficient If we know more about the current MySQL Database specifics.
We should wait for any official announcement when we can start contributing the git-way.

The repository is complete, I'm using it for 3 years. Feel free to push request as wish.
What need more time is the server. It makes no sense to publish it as it is.

There is no mystery for the db. Check the contributor section, I'm posting the structures people need to work on something.

For contributing, I don't think switching to git is the best idea.
First because everything is on it already, and because the branching in mercurial makes more sense for a contribution-oriented project.

Statistics: Posted by Ze_PilOt — 27 Sep 2014, 17:30

Re: devtalk

2014-09-27T16:21:57+02:00

Ze_PilOt wrote:
Dragonfire wrote:He moved to github:
https://github.com/FAForever

It is incomplete, miss branches and has a lot of untested and most likely unwanted modifications.

I'm missing one exploit fix.

Right, the repository was created in a rush from the state of bitbucket. I've had to reset --hard and force push it to get the repo to a clean state of what I think is patch level 3634 (Can't find a commit/tag detailing the release).

This means those who forked need to hard reset their branch as well.

What exploit fix is missing? I'm going to split the fixes I know of into fix-xx branches now, will be pushing them as I come along.

Statistics: Posted by Sheeo — 27 Sep 2014, 16:21

Re: devtalk

2014-09-27T16:18:23+02:00

Indeed we all should wait about 1 month before doing all the stuff. The Repository is not completed yet and it may have major changes without any warnings.
Also there is still a small conversation about a second (document-based) Database. I guess we can discuss this much more efficient If we know more about the current MySQL Database specifics.
We should wait for any official announcement when we can start contributing the git-way.

Statistics: Posted by Frozen_byte — 27 Sep 2014, 16:18

Re: devtalk

2014-09-27T16:04:02+02:00

Ze_PilOt wrote:
I'm missing one exploit fix.

What is missing?

Statistics: Posted by Dragonfire — 27 Sep 2014, 16:04