On 10/26/05, Patrick Guio <address@hidden> wrote:
rOn Wed, 26 Oct 2005, Russ Sherk wrote:
Dear Russ,
>
> Does this work?
> ------------------------------
> cvs up -A doc/Makefile.am
> cvs up -j MyBranch doc/Makefile.am
> ------------------------------
Not completely as expected....
I run first
% cvs update -r MyBranch doc/Makefile.am
P doc/Makefile.am
The changes I have done in this branch are here as expected.
Then
% cvs update -A MyBranch doc/Makefile.am
P doc/Makefile.am
I can see the file as expected in the head (without the changes in the
MyBranch)
Then
% cvs update -j MyBranch doc/Makefile.am
no output
and the file has not the changes from the branch.
Then typing
% cvs status -v doc/Makefile.am
===================================================================
File: Makefile.am Status: Up-to-date
Working revision:
1.2
Repository revision: 1.2 /mypath/.../doc/Makefile.am,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
MyBranch (branch:
1.1.2)
Any idea?
What is the output of 'cvs diff -r 1.2 -r MyBranch'? No output
(no error or other such message) from cvs usually means that the
command produced no changes.
--Russ
P.S. Please ignore if Larry's suggestion works.
Sincerely,
Patrick