Stefan, Therefore the branch is 1.2 and you would have a tag/1.2b3 for example, you put stuff under 1.2 that will go into a 1.2 release and then tag it why you make a public release.
There is a good free online subversion book that covers these topics http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html Paul Stefan Steiniger wrote: > mhm.. btw. > 1.2 is not yet released we are still with 1.2 Beta > > ;o) > > stefan > > Sunburned Surveyor schrieb: > >> Paul wrote: "In my code I maintain separate branches for each minor release >> (so branches/1.2) so that I can make patches to that code base, while >> also working on the next release 1.3..." >> >> So should I do something like "branches/stable/1.3"? >> >> SS >> >> On 6/13/07, Paul Austin <[EMAIL PROTECTED]> wrote: >> >>> SS, >>> >>> We would just do a tag when we do a release. >>> >>> With SVN there isn't really tags and branches per se it's just a >>> convention, what is actually happening behind the scenes is that you are >>> creating a "copy" of the sub directory under say branches/stable to >>> tags/2.2.0. When it copies all it does is say associate each file with >>> the version currently in the source directory. After you've done that >>> you can make changes independently in the copied files. >>> >>> The difference between branches and tags are in branches you're >>> encouraged to make changes to code which you can then merge to/from >>> trunk. In my code I maintain separate branches for each minor release >>> (so branches/1.2) so that I can make patches to that code base, while >>> also working on the next release 1.3 and tag each release under >>> tags/1.2.1. With tags you're not supposed to make changes once you've >>> tagged it, this way you know exactly what was in a release. >>> >>> Takes a while to get used to but then it makes sense. >>> >>> Paul >>> >>> >>> Sunburned Surveyor wrote: >>> >>>> Paul, >>>> >>>> Do I need to create a tag when I make the stable branch? Or do we just >>>> do this for a release? >>>> >>>> SS >>>> >>>> On 6/13/07, Paul Austin <[EMAIL PROTECTED]> wrote: >>>> >>>> >>>>> SS, >>>>> >>>>> We should also create tags when we do a numbered version release so that >>>>> we can recreate that release if required. >>>>> >>>>> Paul >>>>> >>>>> Sunburned Surveyor wrote: >>>>> >>>>> >>>>>> I'm afraid I was already well into the process of setting up the SVN >>>>>> when I read the helpful e-mails in this thread. :[ >>>>>> >>>>>> I have made a stab at setting up the SVN for OpenJUMP at the JPP, and >>>>>> it *may* be ready for use. >>>>>> >>>>>> I made a "trunk" and "branches" folders under the "openjump" folder. I >>>>>> then created a branch of "trunk" in the "branches/stable" folder. This >>>>>> included the scripts, installers, etc., not just the "trunk/src" >>>>>> folder. This will allow us to version all elements of the release, not >>>>>> just the source code. I can change this if it is not acceptable. >>>>>> >>>>>> I also see everyone has SVN access. >>>>>> >>>>>> Can someone check my work on the SVN before we decide to "go live" >>>>>> with it. It is totally possible that I have royally messed things up. >>>>>> >>>>>> The Sunburned Surveyor >>>>>> >>>>>> P.S. - When we do "go live" changes to OpenJUMP should go in the trunk. >>>>>> After they have been "approved" (however that works) we can move them >>>>>> to the stable branch. >>>>>> >>>>>> P.S.S. - Might I suggest that we adopt a "suggested" format for commit >>>>>> comments? I lined out some really basic guidelines for the SurveyOS >>>>>> Project Subversion Repository. I'm not saying we should require >>>>>> developers follow something similar, just that we "suggest" they do. >>>>>> >>>>>> http://surveyoswiki.pbwiki.com/SurveyOS+Subversion+Repository+Usage+Guidelines >>>>>> >>>>>> (I know that having a simple commit log format could help if we wantd >>>>>> to use some scripts or parsing tools of the SVN logs in the future. At >>>>>> least that is what I read in one of my SVN books.) >>>>>> >>>>>> ------------------------------------------------------------------------- >>>>>> This SF.net email is sponsored by DB2 Express >>>>>> Download DB2 Express C - the FREE version of DB2 express and take >>>>>> control of your XML. No limits. Just data. Click to get it now. >>>>>> http://sourceforge.net/powerbar/db2/ >>>>>> _______________________________________________ >>>>>> Jump-pilot-devel mailing list >>>>>> Jump-pilot-devel@lists.sourceforge.net >>>>>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >>>>>> >>>>>> >>>>>> >>>>> ------------------------------------------------------------------------- >>>>> This SF.net email is sponsored by DB2 Express >>>>> Download DB2 Express C - the FREE version of DB2 express and take >>>>> control of your XML. No limits. Just data. Click to get it now. >>>>> http://sourceforge.net/powerbar/db2/ >>>>> _______________________________________________ >>>>> Jump-pilot-devel mailing list >>>>> Jump-pilot-devel@lists.sourceforge.net >>>>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >>>>> >>>>> >>>>> >>>> ------------------------------------------------------------------------- >>>> This SF.net email is sponsored by DB2 Express >>>> Download DB2 Express C - the FREE version of DB2 express and take >>>> control of your XML. No limits. Just data. Click to get it now. >>>> http://sourceforge.net/powerbar/db2/ >>>> _______________________________________________ >>>> Jump-pilot-devel mailing list >>>> Jump-pilot-devel@lists.sourceforge.net >>>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >>>> >>>> >>> ------------------------------------------------------------------------- >>> This SF.net email is sponsored by DB2 Express >>> Download DB2 Express C - the FREE version of DB2 express and take >>> control of your XML. No limits. Just data. Click to get it now. >>> http://sourceforge.net/powerbar/db2/ >>> _______________________________________________ >>> Jump-pilot-devel mailing list >>> Jump-pilot-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >>> >>> >> ------------------------------------------------------------------------- >> This SF.net email is sponsored by DB2 Express >> Download DB2 Express C - the FREE version of DB2 express and take >> control of your XML. No limits. Just data. Click to get it now. >> http://sourceforge.net/powerbar/db2/ >> _______________________________________________ >> Jump-pilot-devel mailing list >> Jump-pilot-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >> >> >> > > ------------------------------------------------------------------------- > This SF.net email is sponsored by DB2 Express > Download DB2 Express C - the FREE version of DB2 express and take > control of your XML. No limits. Just data. Click to get it now. > http://sourceforge.net/powerbar/db2/ > _______________________________________________ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
