[Top][All Lists]

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

finding changes on a branch

From: Andy Howell
Subject: finding changes on a branch
Date: Mon, 06 Aug 2007 18:49:09 -0500
User-agent: Thunderbird (Windows/20070728)

I have a branch with subbranch:

 +-> - main branch
           +-> ( Branch ) - sub-branch

I need to apply the changes between and to If I use the revision number, I can get a diff:

cvs diff -r -r somefile.cpp

cvs stat on somefile.cpp says:

Sticky Tag:  patch1 (branch:

If I try:

cvs diff -r patch1 somefile.cpp
cvs diff -r patch1 -r HEAD somefile.cpp

I don't get and changes.

I can't figure out how to specify the revsions using the branch tags. I'm trying to express "take all the changes on my patch1 branch, and apply them to the head of the main branch".



reply via email to

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