[Top][All Lists]

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

Re: merging problem

From: Russ Sherk
Subject: Re: merging problem
Date: Wed, 26 Oct 2005 10:50:39 -0400

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/
> cvs up -j MyBranch doc/
> ------------------------------

Not completely as expected....

I run first

% cvs update -r MyBranch doc/
P doc/

The changes I have done in this branch are here as expected.


% cvs update -A MyBranch doc/
P doc/

I can see the file as expected in the head (without the changes in the


% cvs update -j MyBranch doc/

no output

and the file has not the changes from the branch.

Then typing

% cvs status -v doc/
File:       Status: Up-to-date

    Working revision:     1.2
    Repository revision: 1.2     /mypath/.../doc/,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.


P.S. Please ignore if Larry's suggestion works.



reply via email to

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