[Top][All Lists]

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

Re: get fresh copy without doing merge

From: Jim Hyslop
Subject: Re: get fresh copy without doing merge
Date: Mon, 21 Nov 2005 09:42:18 -0500
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Hash: SHA1

eagle.liu [??] wrote:
> Hi Jim,
>       Thanks for your help.
>       Seems I did not describe my question clearly.  It would be better to
> have an example.
>       Suppose I have a branch named "REL".  In the main trunk, there have
> five files, a, b, c, d, e.
> file a, b, c are tagged by "cr01-1".  First I need to copy the tagged
> version of a, b, c to branch REL.
> Then after some modifications, file a, d and e are ready to be copied to the
> branch.  This time file a, 
> d and e in the main trunk are tagged by "cr02-1".  Now how do I copy these
> three tagged files to the 
> REL branch without removing file b and c in that branch?

You can use the same procedures, but in the update command specify the
filenames involved:

cvs update -r REL
cvs update -jHEAD -jREL a d e

Or, alternatively, you can use the -p option to 'cvs update' and
redirect the output to the file (you'll have to issue this command
separately for each file involved):

cvs update -r REL
cvs update -p -r HEAD a > a
cvs update -p -r HEAD d > d
cvs update -p -r HEAD e > e

> "The information contained in this email and any attachments may be
> confidential and is provided solely for the use of the intended
> recipient(s).
blah blah blah. Such disclaimers are meaningless when posting to a
public forum, and may actually serve to invalidate all uses of such
disclaimers. Please educate the people who made the decision and tell
them it's in their best interests *not* to automatically append these
disclaimers to each and every email that goes out.

- --
Jim Hyslop
Dreampossible: Better software. Simply.
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


reply via email to

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