httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sascha Schumann <sas...@schumann.cx>
Subject Re: cvs advice
Date Sat, 30 Nov 2002 09:15:24 GMT
On Fri, 29 Nov 2002, Joshua Slive wrote:

> Just a quick question from someone with marginal cvs skills:
>
> Say I have a file checked out at HEAD, and I know that it is identical to
> the version at APACHE_2_0_BRANCH.  Now I make a change, and I want to
> commit the changed file to both HEAD and the branch.  What is the easiest
> way to do this?  Do I really need to have a separate tree checked out with
> the branch, copy the file, and commit over there?  I tried various
> combinations of cvs up -r and cvs commit -r, but I couldn't make it work.

    Nope, no separate tree is necessary.

    # commit file in HEAD
    cvs com file.c

    # move to another branch
    cvs upd -r APACHE_2_0_BRANCH file.c

    # merge in latest rev from HEAD
    cvs upd -j HEAD file.c

    # resolve conflicts at this stage!

    # commit
    cvs com -m "MFH: Merge from head" file.c

    # go back to head rev
    cvs upd -A file.c

    - Sascha

Mime
View raw message