[cvsnt] Re: Bug with rdiff/update using commit identifier

[Matt Schuckmann]

Well since I created the file, branched it, and created the revision it had
better be branched from revision 1.2.

I checked the RCS file and everything looks correct to me, the branch is
created on 1.2 and there is no branch indicated on 1.1.
Still looks like a bug to me.

Here is the text of the RCS file, perhaps you can see something I don't

head 1.2;
access;
symbols
FIX1:1.2.0.2
BLD2:1.2
BLD1:1.1;
locks; strict;
comment @// @;


1.2
date 2005.04.01.23.58.27; author mschuck; state Exp;
branches
1.2.2.1;
next 1.1;
deltatype text;
permissions 666;
commitid 6d4424de01e091e;
kopt kv;
filename @b.cpp@;

1.1
date 2005.04.01.23.58.10; author mschuck; state Exp;
branches;
next ;
deltatype text;
permissions 666;

1.2.2.1
date 2005.04.01.23.59.03; author mschuck; state Exp;
branches;
next 1.2.2.2;
deltatype text;
permissions 666;
commitid 6d4424de0420994;
kopt kv;
filename @b.cpp@;

1.2.2.2
date 2005.04.02.00.10.40; author mschuck; state Exp;
branches;
next ;
deltatype text;
permissions 666;
commitid 6d4424de2fa1275;
kopt kv;
mergepoint1 @1.1@;
filename @b.cpp@;


desc
@@


1.2
log
@Made some simple edits to the trunch of the simple project.
@
text
@/**************************************************************************
**
* COPYRIGHT ETEC SYSTEMS, INC. 2003
*
* ALL RIGHTS RESERVED.
*
* NO PART OF THIS CODE MAY BE COPIED OR MODIFIED WITHOUT THE
* WRITTEN CONSENT OF ETEC SYSTEMS, INC.
****************************************************************************
*
****************************************************************************
*
*
* $Id: b.cpp,v 1.1 2005/04/01 23:58:10 mschuck Exp $
*
* File description:
*
* Project:
*
* $Source: D:/CVSTestData/cvsrepo/simple/b.cpp,v $
*
* Comments:
*
* File revision history can be found at the end of the file.
*
* The following statement provides identification of the file used to
* compile an object file by running ident on the object file
****************************************************************************
/

Test file b.cpp

"Simple edit to b.cpp"
@


1.2.2.1
log
@Committing some bad code, that I'll want to undo.
@
text
@d11 1
a11 1
* $Id: b.cpp,v 1.2 2005/04/01 23:58:27 mschuck Exp $
a29 1
"Here is a bad line that I'm going to remove when I revert"
@


1.2.2.2
log
@Undoing revisions from commit id $1
@
text
@d11 1
a11 1
* $Id$
d17 1
a17 1
* $Source$
d29 2
@


1.1
log
@Initial checkin of simple CVS test project.
@
text
@d11 1
a11 1
* $Id: $
d17 1
a17 1
* $Source: $
d29 1
@



"Tony Hoyle" <tmh at nodomain.org> wrote in message
news:d2kqs8$vti$1 at paris.nodomain.org...
> Matt Schuckmann wrote:
> > Maybe it has something to do with the fact that the previous version of
> > b.cpp is not on the branch.
> >
> > Is this a bug or am I missing something?
> >
> You'd have to look at the RCS file - the previous version is pulled from
> the version number chains in that file, not from any particular
> interpretation of the number itself.
>
> Have a look at that file with something like textpad and you can see the
> chains (the 'next' and 'branches' tags).  For the first item on a branch
> there will be a 'branches' line of 1.2.2.1.. normally that would be on
> 1.2, but it's possible (although rare) for it to be elsehere.
>
> Tony
>
>
> Tony