Code center > Darwinbots Program Source Code

How do I get ericL code?

(1/3) > >>

Botsareus:

--- Quote ---1.  Create a tag of the current code as 2.43
2.  Upload the latest source that Eric had to the trunk, and tag it as 2.44.1 (or whatever number it was).

Then decide if you want the code you're working on to be part of the "official" version, or if there were changes you made to it that are specific to your uses and probably shouldn't belong in the latest version.  If it's fine as "official", commit it to the trunk.  Otherwise create a new branch (named Botsareus or whatever else you want to call it) and commit it to that.
--- End quote ---

I think I figured out step1 , it basically creates a folder on my computer with the source code 2.43 in it transferred from the trunk.

But where and how do I get EricL's update to the source code?

btw: I am using Smart SVN...

Numsgil:
This is an eBook on SVN.  It is long and incredibly thorough, so I don't expect anyone to read the whole thing (if you did, you'd probably know more about it than I do ).  But you can browse through it to figure out the basics at least.  Flip through chapters 1,2, and 4.

That describes basic concepts, but it doesn't really go into the trunk-tag-branch structure.  Basically in the SVN repository itself, at the top level, you have a trunk folder, a tag folder, and a branch folder.  The trunk folder is the current state-of-the-art source code as people are working on it.  Tags represent a forks at a specific moment in time.  For instance, everytime the program is released with a new version number, you'd want to create a new tag.  Branches are experimental forks with changes that may or may not end up integrated into trunk at some point.  There a way to experiment without breaking anyone else's use of the code.

So the top level of the repository should look like:
Trunk
Tags
Branches

So what I want you to do basically is create tags and branches folders.  There's a command in Smart SVN to do this (look under tag/branches in the menu).  Then create a branch into the tags folder labeled "2.43" (or whatever version is in there right now if you can figure it out).  Then go back to trunk.

The download the latest source from the FTP, and copy that into your working copy.  Then commit that to the trunk.  Then take the new trunk and tag it as 2.44.1 (or whatever is the latest version).  Then go back to trunk.  Decide if all of your personal changes should committed to trunk.  If not, you can create a branch called Botsareus in the current Branches folder.  Then copy your personal changes to your working copy, and then commit it to the repository.  From there you can attempt a "merge" back into the trunk and decide what changes you made should go into trunk, and which should stay as part of your personal working copy.

I can probably figure out a temporary SVN repository if you want to practice this stuff.

Botsareus:

--- Quote ---As of 2.43, the Visual Basic source code has been put under SVN control.
--- End quote ---
You mean I should create a new trunk with virsion 2.44.1. Because I don't want to overwrite the exsisting:


--- Quote ---DarwinbotsVB - Revision 5: /
trunk/
--- End quote ---

Numsgil:
Not a new trunk.  Using SmartSVN, create a Tags and Branches folder.  You should be able to do this with the options under the tag/branch in the SmartSVN menu.  Once the folders are created, use SmartSVN to take the current trunk and create a tag with it.  Name this tag 2.43.

When you're done with these steps, nothing in trunk/ should have changed.

Please read the eBook chapters I linked if you haven't yet.  Otherwise this isn't going to make any sense and you might make a mess.

Botsareus:
1.) So currently there are no branches in the "http://opensvn.csie.org/DarwinbotsVB" SVN, that is why I can't see any, correct?

2.) Can I skip over all this tag rubble and simply create a DB2.44.1 branch then copy my personal changes to my working copy, and then commit it to the DB2.44.1 branch ?

My personal changes will include:
Using the DB 2.44.1 source code instead of the FB 2.43 code. The robot/setting/simulation files created when you run "http://www.darwinbots.com/FTP/Darwin21.zip" etc.

Let me answer my own qustions:

2.) You want me to make backups of the code in case I screw something up. 1.) I feel confident enough to try it, but don't blame me if it does not work...

Navigation

[0] Message Index

[#] Next page