Stefan, I've just realized that the branch is not an exact directory copy of the trunk it has a different structure and a subset of the files.
I would manually apply your changes to trunk. When we are ready to create another release we should create a new branch from trunk into branches/1.2 that has all the files in trunk. and then delete the current branch. Paul Paul Austin wrote: > Stefan, > > Here is a nice quick reference for using subclipse > https://www.projects.dev2dev.bea.com/Subversion%20Clients/Subclipse.html > > For development > > 1. Checkout > https://jump-pilot.svn.sourceforge.net/svnroot/jump-pilot/core/trunk/ on > your machine > 2. Make your changes locally > 3. Checkin > > To merge with the branch. > > 1. Switch your local files to the stable branch ('Team>Switch to another > branch tag' in eclipse) > 2. Merge from the trunk to the branch ('Team>Merge' in eclipse) Enter in > the trunk URL with Head revision as the "FROM" URL and then the branch > as the to URL > 3. This will copy any changes in trunk into your local copy of branch, > you'll have to resolve any conflicts > 4. When you are happy checkin the branch > > To make a release. > > 1. Merge all the things you want from trunk into the branch as above > 2. Create a tag of the branch for the new release under tags/<version > number>, basically in SVN this just creates a copy of the branch under > the tag folder > > Now because you checkin to the branch you'll have to merge those changes > into the trunk. For the samll number of changes you can always just > checkout trunk and manually reapply the changes. > > > Paul > > Stefan Steiniger wrote: > >> Hei, >> >> I need some advise. >> Yesterday I made 2 changes >> * update of jmat library and >> * bugfix >> >> I made this changes in and commited to the stable version >> now, as I have been on the way to update the changelog file, I have >> seen, that the one in the stable version is empty, while there is >> another one in the trunk version that is filled. >> >> So I wonder >> - where to make the bugfixes (stable/trunk)?, >> - Have i done the bugfix in wrong place? and >> - which changelog file to use? Or is the empty changelog file in >> "stable" just a mistake and it needs to be replaced? >> As far as I see the change of the librarie can only be done in the >> stable version, as there are no libs in the trunk >> >> and .. when I am asking already.. how can the stuff changed in the trunk >> moved to the stable version? >> >> stefan >> >> ------------------------------------------------------------------------- >> This SF.net email is sponsored by: Splunk Inc. >> Still grepping through log files to find problems? Stop. >> Now Search log events and configuration files using AJAX and a browser. >> Download your FREE copy of Splunk now >> http://get.splunk.com/ >> _______________________________________________ >> 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: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > 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: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
