thanx a lot for your advise. Its good to have experienced developers like Martin, Larry and You on the list
stefan Paul Austin schrieb: > Hi Stefan > > For now lets remove the 1.2 branch as we are not going to be maintaining > it. Do as we are doing for now by updating trunk and then creating a tag. > > When we release 1.2 final at that point we'll create the branch. > > The reason why the branch isn't working is that if the target directory > of a branch already exists branches/1.2 then subclipse just creates a > new directory with the same of the source below it rather than over > writing it. > > The merge function is done against the local checked out copy of the > project. All it does is basically find the differences between the local > copy and the repository copy that you want to copy from and then checks > those out to your local copy. You then have to resolve any conflicts and > then when happy check them back in. > > What I'd encourage all developers to do is find a SVN repository that > they can practice with dummy projects, some of it is quite confusing. I > have to remind myself the specifics of merging every time I do it. > > Paul > > Stefan Steiniger wrote: >> Paul, >> >> thanx for your advise... i was just on the way to write you. >> it is really strange.. i could use "branch/tag" option of subclipse to >> create a new tag. But it does not work for branches/1.2. Here it always >> creates a copy of trunk in a new subfolder called "trunk". >> The only way - using the normal copy function - is to copy folder by folder. >> >> The merge function you mentioned I can not find in subclipse SVN >> Repository View in the mouse menu. Do i need to make the merge locally? >> >> probably it is the best way to remove all sources under branches/1.2/ as >> far as we not have yet a real 1.2 release >> >> stefan >> >> Paul Austin schrieb: >> >>> I just noticed the following checkin which has created a sub directory >>> called trunk under core/branches/1.2. I'm presuming that what was >>> supposed to happen was that all the latest changed in trunk was to be >>> copied to be under the branch. >>> >>> There are two ways to do this. >>> >>> 1. delete the old branch 1.2 and then use the branch tag command to copy >>> trunk to branches/1.2 >>> 2. Use the merge function to merge the changes from trunk to the branch. >>> To do this first use the switch command to switch your local copy to the >>> branch, you then use the merge command to merge the changes into your >>> local copy. Then finally commit those changes to the branch. >>> >>> Option 1 only works if no local changes occur to the branch, otherwise >>> you have to use option 2. >>> >>> When we get to the point where we have the final 1.2 release we may then >>> create bug fixes against the 1.2 branch which we may also apply to >>> trunk, that's when the merging comes in >>> >>> Paul >>> >>> -------- Original Message -------- >>> Subject: [Jump-pilot-svn-notify] SF.net SVN: jump-pilot: [979] >>> core/branches/1.2/trunk/ >>> Date: Thu, 16 Aug 2007 07:19:28 -0700 >>> From: [EMAIL PROTECTED] >>> Reply-To: [EMAIL PROTECTED] >>> To: [EMAIL PROTECTED] >>> >>> >>> >>> Revision: 979 >>> http://jump-pilot.svn.sourceforge.net/jump-pilot/?rev=979&view=rev >>> Author: mentaer >>> Date: 2007-08-16 07:19:28 -0700 (Thu, 16 Aug 2007) >>> >>> Log Message: >>> ----------- >>> >>> >>> Added Paths: >>> ----------- >>> core/branches/1.2/trunk/ >>> >>> Copied: core/branches/1.2/trunk (from rev 978, core/trunk) >>> >>> >>> This was sent by the SourceForge.net collaborative development platform, >>> the world's largest Open Source development site. >>> >>> ------------------------------------------------------------------------- >>> 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-svn-notify mailing list >>> [EMAIL PROTECTED] >>> https://lists.sourceforge.net/lists/listinfo/jump-pilot-svn-notify >>> >>> >>> ------------------------------------------------------------------------- >>> 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 > > ------------------------------------------------------------------------- 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
