RE: Merging from one module into another

[Christopher.Fouts]

Using your terminology,
        > cvs co A
        > cvs update -j A -j A_DEV
        (Resolve conflicts, if any)
        > cvs commit

>-----Original Message-----
>From: address@hidden 
>[mailto:address@hidden
>] On Behalf Of Jean-Christian Imbeault
>Sent: Wednesday, June 23, 2004 2:36 AM
>To: address@hidden
>Subject: Merging from one module into another
>
>
>At my company we have a repository with two projects (I hope I 
>have the terminology right). One project is A and the other is A_DEV.
>
>Our developers work and commit only into A_DEV. When 
>everything is ready for release we move the changes into A and release.
>
>My question is what is the easiest (or best?) way of merging 
>the changes from A_DEV into A? I would like to be able to do 
>something like:
>
># cvs checkout A_DEV
># cvs checkout A
># cvs update (but use files from A_DEV to update A)
>
>but I can't figure out the proper syntax ...
>
>I'm new to cvs so please bare with me if this is a newbie question ....
>
>Thanks,
>
>Jc
>
>
>
>_______________________________________________
>Info-cvs mailing list
>address@hidden
>http://lists.gnu.org/mailman/listinfo/info-cvs
>