SVN

[Rob Cashwalker]

I downloaded and installed the subversive component for eclipse, and have it connected to our SVN. But I haven't had a chance to actually figure out how to make it WORK. (anything other than just browsing the branches and stuff)

[DennisBergkamp]

Rob,

I don't fully understand how it all works either, I'm not sure if we have the same kind of plugin installed (I think I downloaded Subclipse, there's a few different ones).

This is what I do know:
For me, when you right click on your project, go to Team. There you will see the three major options at the top "Synchronize with Repository", "Commit" and "Update". Commit will basically upload all your changes to the Repository, whereas "Update" will (download and) update your local version with the changes made on the repository. Synchronize is a combination of both, it will upload (commit) the repository with your changes and it will update your local version with changes made on the Repository by other people.
I'm sure if there's conflicts, some diff tool will show both different versions of the .java file, and a manual selection will have to be made to finalize the process.

[silly freak]

Import.../SVN/Checkout Project from SVN

check out the MTGForgeNew folder...

I have a question... I was able to check out the sources, but they got directly into my project folder. do you have an idea how to get it in my source folder?

[DennisBergkamp]

Hmm, that I don't know. There must be some way to import them into a subdirectory ?

[silly freak]

maybe the easier way is to put an additional "src" superfolder in the SVN, so the standard checkout works

[DennisBergkamp]

Ok, currently my local source is in some directory \Forge2\ ("MTGForgeNew" is actually the project name I used in Eclipse).
Would moving all the stuff into \Forge2\src\ work?

[Rob Cashwalker]

maybe merging manually wouldn't be too bad after all?

[DennisBergkamp]

Heh, I dunno.
One thing I really do like about this SVN thing is that I can quickly release up-to-date source with one single click.

But I'm not sure, maybe in practice it's a big pain to use when a lot of people start updating/changing code (I'm not really sure how to revert to previous versions... I guess there must be ways to revert an entire project, or just revert a file or a small subset of files).

[zerker2000]

So did you guys email rares about getting "committer" privileges?

I sent a PM... I don't see how that would help, Eclipse is currently at 0% completed "checking out MTGForgeNew", and hasn't asked for any account details yet .

EDIT:Ok, it finally fetched the code, and has asked for a password when I tried to commit. I do hope rares checks his PMs often .

[frwololo]

maybe in practice it's a big pain to use when a lot of people start updating/changing code

It's always painful to work on the same source code with other people. But trust me, SVN makes it way easier than doing it by hand.

You guys seem to have issues mostly because you use Eclipse, which assumes that the source files will be in a specific structure/set of folders.
I use tortoiseSVN, which is integrated in the menus of windows, and I have no such issue.

Of course, getting a password is another issue.

[zerker2000]

I use tortoiseSVN, which is integrated in the menus of windows, and I have no such issue.

Which could be problematic if some of us happened to use e.g. Linux.

[Rob Cashwalker]

But then you wouldn't have any problem in the first place - Linux has SVN from the git-go.

[zerker2000]

Yes, however eclipse functionality on Linux is no better than on any other OS .

[zerker2000]

The svn code doesn't seem to have Multi-Color generation working as it should: an error pops up when I try to use it, and Gui_NewGame is complaining about GenerateConstructedMultiColorDeck not being resolved as a type, which would explain such behavior. Are we missing an import or class file?

[DennisBergkamp]

Ah this is possible, I don't think I've updated the SVN quite as recently (the source that comes with the 10/15 beta is actually newer).
I'll fix some of the bugs reported, and update the SVN.