info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merge to branch


From: Rohan Nandode
Subject: Re: Merge to branch
Date: Mon, 05 Jul 2004 20:15:55 +0530
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020830

If both main trunk and branch R18 are in sync till now, then you can merge the changes with following with branch as working copy.

cvs update -j HEAD -j R18 <your file names>

This also assumes that there are no commits to main trunk after your required changes. otherwise they will also be merged into the branch.

HTH
Rohan

news wrote:
Hello,

I have a "main trunk" and a branch "R18". Some changes (on 3 files) have
been made by programmer on the main trunk but they should have been done in
the R18 branch. I'd like the changes made on the three files to be merged
(or just copied) to the R18 branch. Of course, the R18 branch should
continue to "live" but with the changes (I hope my english is good
enougth...).

Thanks.

Jean


_______________________________________________
Info-cvs mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/info-cvs






reply via email to

[Prev in Thread] Current Thread [Next in Thread]