Improving the Irrlicht release management

[hybrid]

CuteAlien, you can use 'switch --relocate' to change servers. You can swap to your own SVN server, make branches and stuff, and finally change back to SF SVN to update to latest Irrlicht development.

[alexionne]

SVN does not seem to work for my needs. I have for example X-versions of Irrlicht on my computer and they have already the svn-information for the sourceforge server added. I don't know a way so far to work additionally with an second server at home with the same sources and svn. I suppose I will simply need a distributed source versioning system for that.

You mean, you want to work on Irrlicht and have SVN control over YOUR modifications on YOUR server, but you also want to have ability to use SF SVN server? If this is your situation, you can use Merge command.

In the latest project, I've used SVN very efficiently for similar situation: the other team has been working at the same time on the code, and SVN made it all - I can recall only one or two conflicts!

Basicly, you need two copies of Irrlicht: one which is Checkout-ed from SF, and your own. Let's say you start with SF revision (SFR) #1000, and your local revision (YLR) #1. In that situation, Branch/Tag SFR as "SFR 1".

1. So, you work on your local copy, work, work, work... And you get to YLR #25. At that moment, SFR gets to #1053, and you want to get changes from SFR. What you do it is:
2. SVN Update your SF copy to SFR #1053.
3. Branch/Tag your current SF copy (SFR #1053) as "SFR 2".
4. Merge changes between "SFR 1" and "SFR 2" into YLR. I use TortoiseSVN on Windows, and it sings like a bird on this
5. SVN Commit YLR as #26.
6. Go to 1

Is this what you wanted to have? If not, please give more details, there HAS to be some solution

And, yes - SVN is not perfect. Some features it really needs are:
- Rename should be standard operation (like Add, Remove, Change are)
- it should have more awareness of directories
- (thanks to M$), on Windows there are problems when you have file somefile.txt and SomeFile.txt on SVN
- there are too much operations with file system

Best,
Aleksa

[CuteAlien]

Thanks for that info.

I have usually a lot of Irrlicht versions on my computer.
Usually it's like that
1. I check out a current Irrlicht version. That's always the current Irrlicht version and is updated from time to time.
2. I make a copy for my project. That's the version with which I usually will work.
3. Each time I merge the official Irrlicht with my project I will make a copy of the Irrlicht of that time. I need that so I can do fast diffs and only get the stuff which I changed myself.
4. Sometimes I have some more copies with features which will get in my work copy or where I try to modify the official version to prepare patches. Those will sometimes run for some weeks/months parallel to the official versions but are usually rather static. If I find time (...) I do patches for that task instead by now.
5. I have several projects running and the above is valid for each project (so expect 10+ irrlicht version on my computer at all times). I do sometimes merge features between projects, but usually I try to get stuff back into the official Irrlicht.

It has to work on linux+windows with only one computer (unfortunately no real server, that makes it somewhat harder).

Also there is in my case a third svn-server involved for the irrlicht version of another company.

I will check if one of your solutions does work, but from what I read about the distributed sourcecontrol systems, they seem to be a lot better suited for my needs, so I guess I will switch to one of those.