Re: Strange diff behavior on branch

[Mark D. Baushke]

Lemke, Michael  IZ/HZA-IC1 <address@hidden> writes:

> Not having seen a single reply I try again and ask:

Does the command:

     cvs diff -r B_PROD -D 16-jul-2003 koucopy.sh

work for you?

Right now you are asking to compare the mainline version of 16-jul-2003
to the checked out copy and cvs is telling you that there is no copy
on the trunk for the comparison. You do not show us enough versions of
the 'cvs log' output to know if that is what should be expected or not.

However, I would not expect 'cvs diff' to find version 1.1.2.10 without
using the '-r B_PROD' argument.

> > I have a file that was initially added on a branch.  If I
> > do a diff based on a date I get this:
> > 
> > $ cvs diff -D 16-jul-2003  koucopy.sh
> > cvs diff: koucopy.sh is a new entry, no comparison available
> > $ cvs stat koucopy.sh
> > ===================================================================
> > File: koucopy.sh        Status: Up-to-date
> > 
> >    Working revision:    1.1.2.12        Mon Jul 21 05:48:12 2003
> >    Repository revision: 1.1.2.12        
> > /mnt/bflow/cvs/repos/inacom/Attic/koucopy.sh,v
> >    Sticky Tag:          B_PROD (branch: 1.1.2)
> >    Sticky Date:         (none)
> >    Sticky Options:      (none)
> > $ cvs log koucopy.sh
> > 
> > RCS file: /mnt/bflow/cvs/repos/inacom/Attic/koucopy.sh,v
> > Working file: koucopy.sh
> > head: 1.1
> > branch:
> > locks: strict
> > access list:
> > symbolic names:
> >         B_PROD: 1.1.0.2
> > keyword substitution: kv
> > total revisions: 13;    selected revisions: 13
> > description:
> > ----------------------------
> > revision 1.1
> > date: 2002/12/13 14:08:29;  author: bflowadm;  state: dead;
> > branches:  1.1.2;
> > file koucopy.sh was initially added on branch B_PROD.
> > ----------------------------
> > revision 1.1.2.12
> > date: 2003/07/21 05:48:12;  author: bflowadm;  state: Exp;  
> > lines: +5 -2
> > ...
> > $ cvs -v
> > 
> > Concurrent Versions System (CVS) 1.12.1 (client/server)
> > 
> > 
> > 
> > Is this expected behavior?  Diffs on revisions (-r 1.1.2.10) work.

Yes, I think it is expected behavior if there are no versions on the
trunk to compare.

        -- Mark