RE: Strange diff behavior on branch

[Lemke, Michael IZ/HZA-IC1]

> -----Original Message-----
> From: Mark D. Baushke
> Sent: Wednesday, July 30, 2003 6:16 PM
> To: Lemke, Michael IZ/HZA-IC1
> Cc: 'address@hidden'
> Subject: Re: Strange diff behavior on branch 
> 
> 
> 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?

Not really:

$ cvs diff -r B_PROD -D 16-jul-2003 koucopy.sh
cvs diff: koucopy.sh was removed, no comparison available

> 
> 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. 

Makes sense.

> You do not show us enough versions of
> the 'cvs log' output to know if that is what should be 
> expected or not.

If cvs works as you suggest I suppose it is since there is no 
version on the trunk.  All I cut from the log output were the
additional 11 branch revisions.  It shows everything else that
there is.  But here are a couple more:

----------------------------
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
Fehler behoben,mg.
----------------------------
revision 1.1.2.11
date: 2003/04/30 14:56:11;  author: bflowadm;  state: Exp;  lines: +27 -6
cvs add bei neuen Modulen eingefuegt,mg.
----------------------------
revision 1.1.2.10
date: 2003/04/07 14:50:49;  author: bflowadm;  state: Exp;  lines: +5 -2
mkdir Kommande geaendert,mg.
----------------------------
revision 1.1.2.9
date: 2003/03/31 12:42:18;  author: bflowadm;  state: Exp;  lines: +42 -22

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

Ok, then something else is amiss.  I can't to diffs on a branch
based on dates.  It seems date references always pick trunk
revisions.  Strange...

Thanks,
Michael

> 
> > > 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
>