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
