[cvsnt] co getting wrong versions?

[David Somers]

Greetings,

The attached png shows the layout of a file in my repository.

# cvs co -j FRED_1_FIXES -j FRED_2_FIXES prj/fred
cvs server: Updating prj/fred
U prj/fred/fred.c
RCS file: /omz13/prj/fred/fred.c,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1
Merging differences between 1.1.1.1.2.1 and 1.1.1.1 into fred.c
rcsmerge: warning: conflicts during merge
C prj/fred/fred.c

Now that looks ok to me... I'm trying to merge the two branches, and its
cvsnt says its retrieving right the revisions.

However, when I look at the file its splated out (prj/fred/fred.c), what its
actually done is merged revisions 1.1.1.1.2.1 and 1.1.1.2 (but it says it
was doing 1.1.1.1).

This strange behaviour can be verified if I do an rdiff:

By referring directly by revison numbers:

$ cvs rdiff -u -r 1.1.1.1.2.1 -r 1.1.1.1 prj/fred/fred.c
Index: prj/fred/fred.c
diff -u prj/fred/fred.c:1.1.1.1.2.1 prj/fred/fred.c:1.1.1.1
--- prj/fred/fred.c:1.1.1.1.2.1 Fri Jun 17 14:20:34 2005
+++ prj/fred/fred.c     Fri Jun 17 13:59:34 2005
@@ -1,3 +1,3 @@
 /* this is fred */

-static int i;
+static i;

Is correct. And by tags names (also correct):

$ cvs rdiff -u -r FRED_1_FIXES -r FRED_2_FIXES prj/fred/fred.c
Index: prj/fred/fred.c
diff -u prj/fred/fred.c:1.1.1.1.2.1 prj/fred/fred.c:1.1.1.1
--- prj/fred/fred.c:1.1.1.1.2.1 Fri Jun 17 14:20:34 2005
+++ prj/fred/fred.c     Fri Jun 17 13:59:34 2005
@@ -1,3 +1,3 @@
 /* this is fred */

-static int i;
+static i;

But when doing checkout (as discussed at the top), cvsnt writes out fred.c
as

 $ cat fred.c
/* this is fred */

<<<<<<< fred.c
static int i;

void newstuff(void)
{
}

===static i;
>>>>>>> 1.1.1.1

Yes, it says its merging against 1.1.1.1, but it isn't, its really againt
1.1.1.2 as can be shown by rdiff'ing

 $ cvs rdiff -u -r 1.1.1.1.2.1 -r 1.1.1.2 prj/fred/fred.c
Index: prj/fred/fred.c
diff -u prj/fred/fred.c:1.1.1.1.2.1 prj/fred/fred.c:1.1.1.2
--- prj/fred/fred.c:1.1.1.1.2.1 Fri Jun 17 14:20:34 2005
+++ prj/fred/fred.c     Fri Jun 17 14:00:15 2005
@@ -1,3 +1,8 @@
 /* this is fred */

 static int i;
+
+void newstuff(void)
+{
+}
+


Tony/Others,

Any ideas... is this a bug, or am I doing something silly?

Greetings from Luxembourg,

David