[Top][All Lists]

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

Re: how to list files committed to a particular branch?

From: Larry Jones
Subject: Re: how to list files committed to a particular branch?
Date: Sat, 25 Dec 2004 16:14:36 -0500 (EST)

Tom Roche writes:
> Over the past month-or-so I have committed a bunch of code to V6001,
> and I want to "roll it up" into HEAD. How to identify files committed
> to V6001?

When you create a branch, you should also create a revision tag at the
root of branch.  For example:

        cvs tag V6_root
        cvs tag -b V6

Had you done that, you could use "cvs diff -rV6_root -rV6" to see what
has changed on the branch.  For long lived branches that you may want to
merge to the trunk multiple times, it's also a good idea to create a
"floating" tag to indicate the last merge point (e.g., V6_last_merge). 
Then you can see what's changed since the last time you merged with "cvs
diff -rV6_last_merge -rV6".  Each time you merge, you move the floating
tag to the revision you just merged.

If you neglected to do that at the time, you should be able to create to
create such tags now by specifying a date/time for the tag.

-Larry Jones

Somebody's always running my life.  I never get to do what I want to do.
-- Calvin

reply via email to

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