Pages: 1
  Print  
Author Topic: Trunkification (svn rearranged)  (Read 2068 times)
Offline (Female) IsmAvatar
Posted on: November 29, 2009, 03:15:02 PM

LateralGM Developer
LGM Developer
Location: Pennsylvania/USA
Joined: Apr 2008
Posts: 886

View Profile Email
For those of you who have been keeping up with or checking out from the SVN (all 3 of you...), as of r51 there's been a small change which should be a welcoming move to anyone who's ever used SVN before. We've split Enigma up into trunk, tags, and branches.
This move came after we realized that serprex was apparently trying to create a branch but we didn't have the t/t/b structure in place.

What this means:
> If you don't use the SVN, this means nothing to you.

> If you checked out from the SVN already and do a regular svn update or svn commit, you will need to do a one-time svn switch
> svn switch https://enigma-dev.svn.sourceforge.net/svnroot/enigma-dev/trunk

> If you wish to check out a fresh copy of enigma from the SVN, you'll need to append /trunk to the URL.
> svn co https://enigma-dev.svn.sourceforge.net/svnroot/enigma-dev/trunk enigma-dev

> If you wish to work on or check out the branch that serprex seems to want to work on, you can do an svn switch to the branch:
> svn switch https://enigma-dev.svn.sourceforge.net/svnroot/enigma-dev/branch/enigma-dev

What are branches, tags, and trunk?
Developers sometimes like to copy the entire project to a few locations so they can keep backups or work on changes without screwing up other parts.
A Tag is a stable copy. This is usually used to tag releases and betas with specific revisions. There can be multiple tags, and they are usually pretty stable, and usually don't change.
A Trunk is the main copy. This is where all the main development goes on. There is only one trunk, and it is moderately stable/unstable. Usually for stable versions, you will be recommended to a specific revision number.
A Branch is a specific development copy. When someone wants to try an experiment or implement a new big feature, they will oftentimes create a branch and work on it there, so that they don't disturb the main development (trunk) with their changes until they are done, and they merge it back with the trunk. There can be multiple branches going on at once, and they are usually quite unstable.

More advanced things:
> Creating new branches, or merging the existing branch back with the original project, should be as simple as calls to svn copy and svn merge, respectively. The SVN Book should be a handy resource here, particularly the chapter on Branching and Merging:
> http://svnbook.red-bean.com/en/1.0/ch04.html


These changes and their explanations courtesy of
-IsmAvatar
Logged
Offline (Female) serprex
Reply #1 Posted on: November 29, 2009, 07:42:07 PM
Smooth ER
Developer
Joined: Apr 2008
Posts: 106

View Profile WWW
& if you think svn is a joke: http://github.com/serprex/Enigma
Logged
Offline (Male) notachair
Reply #2 Posted on: November 30, 2009, 12:51:00 AM

Definitely not a chair
Contributor
Joined: Feb 2008
Posts: 299

View Profile
& if you think svn is a joke: http://github.com/serprex/Enigma
http://www.kernel.org/pub/software/scm/git/docs/git-svn.html :eng101:
« Last Edit: November 30, 2009, 12:53:41 AM by a2h » Logged
Offline (Unknown gender) Game_boy
Reply #3 Posted on: November 30, 2009, 11:42:44 AM
Member
Joined: Apr 2008
Posts: 228

View Profile
Are you doing the LGM development in that svn now? There's been no updates to your Trac page in months.
Logged
Offline (Unknown gender) luiscubal
Reply #4 Posted on: November 30, 2009, 01:05:06 PM
Member
Joined: Jun 2009
Posts: 452

View Profile Email
SVN != Trac.
SVN is versioning. Trac includes bug tracker, etc.
Logged
Offline (Unknown gender) Game_boy
Reply #5 Posted on: November 30, 2009, 05:11:43 PM
Member
Joined: Apr 2008
Posts: 228

View Profile
SVN != Trac.
SVN is versioning. Trac includes bug tracker, etc.

So does the lack of activity on Trac mean lack of activity on LGM?
Logged
Offline (Female) IsmAvatar
Reply #6 Posted on: November 30, 2009, 10:10:39 PM

LateralGM Developer
LGM Developer
Location: Pennsylvania/USA
Joined: Apr 2008
Posts: 886

View Profile Email
LGM development has paused for a while, since Quadduc and Clam have pretty much left it alone, and I've been busy doing schoolwork (had a very intense semester) and helping out with Enigma. Once Enigma gets closer to release, I'll also put the finishing touches on LGM to get the 1.6 release out. For now, though, the latest versions should be suitable and stable enough for whatever you plan on using it for. If you find any bugs or areas needing improvement, don't hesitate to report them to me and I'll see to it that they're fixed as quickly as possible.

Basically, it's not dead, it's ready. We're just waiting for Enigma before we move forward.
Logged
Offline (Male) Josh @ Dreamland
Reply #7 Posted on: December 01, 2009, 08:19:31 PM

Prince of all Goldfish
Developer
Location: Pittsburgh, PA, USA
Joined: Feb 2008
Posts: 2949

View Profile Email
ENIGMA's going to be doing the same on my part for a bit here. I gave serp SVN commit privileges, so perhaps he will develop it. I'll be doing my three essays and presentation this week and Monday. After that, I'm free...
Logged
"That is the single most cryptic piece of code I have ever seen." -Master PobbleWobble
"I disapprove of what you say, but I will defend to the death your right to say it." -Evelyn Beatrice Hall, Friends of Voltaire
Pages: 1
  Print