U++ forum: Welcome to the forum

Re: Great (and funny) Linus' speach about GIT [message #13476 is a reply to message #13475]

Thu, 10 January 2008 16:24

mdelfede
Messages: 1307
Registered: September 2007

Ultimate Contributor

mr_ped wrote on Thu, 10 January 2008 14:04

I quite agree with you about the need of central point.
Than again I quite agree with Linus about cumbersome merges in CVS and SVN.
Did you notice that if you try to merge the same commit from other branch two times, the SVN goes hairwire instead of ignoring it?

No, I didn't but I can imagine that Smile

Well, outside svn I use 'meld', but it works only on Linux. It's a really good diff/merge program.

Quote:

Yes, it's user mistake to try to merge the same changes two times over code base, but the practical implications do result into "strong opinion". Very Happy

yes, such mistakes are very common.... svn should behave better on them.

Quote:

So if there is free versioning system with better merge tools than SVN+TortoiseSVN (the tortoise merge is not bad to see changes, but far from "the" artificially intelligent merge tool which would do much of (obvious) merge work for you - I would go for it.

Me too. I'd like a centralized versioning system with a really good merge tool, but there isn't any yet. But it can be done as I do, with SVN and an external merge tool. Not too confortable, bt better than nothing...

Quote:

I didn't try GIT yet, so I'm not sure how smooth the merges are there. IF they are really as nice as Linus advocates, it would be probably easier to force Mirek be a "Linus" for upp and having his repository as "central" one, than to fight with SVN later, if the user base grows (and I think it will grow.. maybe not fast, but so far every year there are more people here using upp).

I think the basic choice about centralized vs distributed is about how many contributors to core upp we expect in future. Whether Mirek wants to keep it as his personal piece of SW with few core developers, or he wants to release upp into wild and let everybody do with it whatever he wants, and than upon popular request merging those improvements back into official version.

I'm in favour of a centralized system because with a decentralized one it's too easy that a developer forget to sync/merge to other's repos. Keeping a centralized ftp repo with mercurial would be better, but it depends everytime of the syncs from each developer. Which has to sync their repos, then ftp them on central site. I'm afraid of what would happen if 2 developers transfer at the same time their repos on ftp....

I guess for the moment the best would be a svn repo with a main 'stable' trunk, updated only by Mirek or a few developers, and some development branches to accept contibutions.
But that one can't be on sourceforge *or* you must accept the risk of giving write access to the full svn repo to everybody.

Ciao

Max

Report message to a moderator