Re: Committing a version from code several revisions back

Am 05.05.2010 um 01:18 schrieb Bill_CT:

> Apologies if this has been asked - I did my best searching the group's messages. I think I can do what I want, but I don't want to hose my live repository trying to do what I think might be the procedure. I've used branches, but only from the last revision, not from the middle.
> 
> For this discussion, let's say I have checked in tags R_1_1, R_1_2, R_2_0, R_2_1 for 1.1, 1.2, 2.0, and 2.1 releases of code.
> 
> I have to go back to 1.2 to add something. I did this by checking out to a new folder using Tag/Branch R_1_2. I've made the additions to 1.2 and called it (in the source) 1.3. How do I add 1.3 back into the repository after 1.2? And how do I take the changes made to 1.2 now in 1.3 and add them into 2.2 (which is the current development not committed or tagged)? I think the latter procedure is to update with a merge from R_1_3 into the files on my PC, but how do I get a tag (or is it branch) R_1_3 after R_1_2?.
> 

You may want to read up on CVS tags & branches.
Generally, tags & branches are ordered by their revisions, but you don't create or order a new revision "after" another one manually.

The process would be:

(1) create a new branch at the release tag, let's say create a branch named "B_1_3" at tag "R_1_2". This will create a branch starting at the 1.2 release. 

(2) Update your sandbox to this branch

(3) Modifiy your sources and commit them on the B_1_3 branch

(4) When all is good, you can tag the sources on this branch as R_1_3, as this will be your 1.3 release.

(5) To merge the changes into the main branch (aka trunk), do as you described, updating with merging changes from the B_1_3 branch.


The key here is to create a new branch at the tag corresponding to the release you want to use as your starting point.


HTH,
</jum>

P.S.: If you have already changed your sources, you can still update the sandbox to the branch. Since the branch is based on the same revision you already have, this is purely a bookkeeping operation in this case...


--
And God said"Let there be light." But then the program crashed because he was trying to access the 'light' property of a NULL universe pointer.





------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/cvsgui/join
    (Yahoo! ID required)

<*> To change settings via email:
    [email protected] 
    [email protected]

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/