CVS how to swap HEAD and a Branch? (was RE: CURRENT direction for James :-))

[Danny Angus <Da...@slc.co.uk>]

> How that happens?  Uh ... Serge?  Danny?  CVS mavens?  :-)

A quick survey of google reveals that HEAD is quite possibly just a "magic"
Tag.

So ... we merge those parts of 3 we want with whichever 2 branch which we
want to become the HEAD and check them into the 2 branch.

It *ought* to be possible then to checkout and  tag the HEAD as BRANCH_3

and remove the HEAD tag from this branch

then checkout our 2 branch

and tag it with HEAD.


Thats just a guess though, it still might pay to post this question to
infrastructure@ in case I'm wrong or there are any nasty gotchas, so I'm
cc'ing them in on this.
 TIA infrastructure guys :-)
d.


FYI Noel wrote:

"As I understand the concept, the desired changes from MAIN will be merged
into branch_2_1_fcs.
Then MAIN will be pushed off as a branch (or we can just tag it as
PRE_2_2_MERGE),
and somehow branch_2_1_fcs will be merged back as MAIN."

d.




***************************************************************************
The information in this e-mail is confidential and for use by the addressee(s) only. If you are not the intended recipient (or responsible for delivery of the message to the intended recipient) please notify us immediately on 0141 306 2050 and delete the message from your computer. You may not copy or forward it or use or disclose its contents to any other person. As Internet communications are capable of data corruption Student Loans Company Limited does not accept any  responsibility for changes made to this message after it was sent. For this reason it may be inappropriate to rely on advice or opinions contained in an e-mail without obtaining written confirmation of it. Neither Student Loans Company Limited or the sender accepts any liability or responsibility for viruses as it is your responsibility to scan attachments (if any). Opinions and views expressed in this e-mail are those of the sender and may not reflect the opinions and views of The Student Loans Company Limited.

This footnote also confirms that this email message has been swept for the presence of computer viruses.

**************************************************************************


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org

Re: CVS how to swap HEAD and a Branch? (was RE: CURRENT direction for James :-))

[Serge Knystautas <se...@lokitech.com>]

Danny Angus wrote:
>>How that happens?  Uh ... Serge?  Danny?  CVS mavens?  :-)

Here's what I would do...

1. tag on branch_2_1_fcs to mark where we are swapping (in case anyone 
commits further on that branch).  Call the tag "tag_2_1_TO_HEAD"
2. tag and branch on HEAD where we are leaving it.  Call the tag 
"tag_3_0_dev" and the branch "branch_3_0_dev".
3. Ugly part...
   a. checkout "tag_2_1_TO_HEAD" in one directory
   b. checkout HEAD to another.
   c. Manually delete all the non-CVS special files from the HEAD checkout.
   d. Copy all the non-CVS special files from tag_2_1_TO_HEAD into the 
HEAD directory.
   e. Commit all changes (removed files, new directories, added files, 
changed files).
4. Tell everyone so people who were working on the 2.1 branch now work 
on HEAD and people on HEAD work on 3.0 branch.

That will leave you a tag on the 2.1 and 3.0 trees where we swapped, 
HEAD will now have exactly all the code that was in the 2.1 branch, and 
what was in HEAD will be in its own branch.

-- 
Serge Knystautas
President
Lokitech >> software . strategy . design >> http://www.lokitech.com
p. 301.656.5501
e. sergek@lokitech.com


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org

RE: CVS how to swap HEAD and a Branch? (was RE: CURRENT direction for James :-))

["Noel J. Bergman" <no...@devtech.com>]

> A quick survey of google reveals that HEAD is quite possibly just
> a "magic" Tag.

HEAD is a magic tag, but AIUI it means the HEAD of a branch.  MAIN is the
branch that we're talking about, not HEAD.

This would be (hearing Justin mutter in the background): "So much easier
with Subversion."  :-)

	--- Noel


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org