Date/branch checkout issue

[Greg Kilfoyle]

Hi,

We're using cvs version 1.11.17 on RedHat FC3. It's a client/server
model with pserver as the access method.

We have experienced a problem when checking out using both -r and
-D options. A file that was added to the trunk appears on a branch
checkout, even though that file wasn't merged to the branch until
after the date specified using -D.

To explore this problem further I updated the client to 1.11.19 and
run into the same issue. I then updated the server to 1.11.19 and
the issue still persisted.

We call HEAD/trunk "main" or "mainline". In terms of sync/merging,
here are the flows:

  branch_2_0B1 -> branch_2_0
  branch_2_0   -> main (trunk)
  main         -> branch_dev1
                  branch_dev2
                  branch_dev3
                  branch_dev5
                  branch_dev6
                  branch_dev7
  branch_dev3  -> branch_dev4

The file in question was originally added to main (trunk) on Feb-18.
There was a sync/merge from main to dev2 on Feb-23. Performing a
checkout using -r branch_dev2 -D "2006-02-20 00:00" brings in this
added file, but I don't believe it should.

Here is the current cvs log for the file in question. Names have been
changed, but are consistent.

RCS file: /cvs/myos/file.xml,v
Working file: file.xml
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        tag_sync_main_to_dev7-2: 1.1
        tag_sync_main_to_dev2-16: 1.1
        tag_sync_main_to_dev1-11: 1.1
        tag_sync_dev3_to_dev4-14: 1.1.6.1
        tag_sync_main_to_dev3-14: 1.1
        tag_sync_2_0_to_main-4: 1.1
        branch_dev5: 1.1.0.18
        tag_sync_2_0B1_to_2_0-4: 1.1
        tag_sync_main_to_dev5-10: 1.1
        branch_dev6: 1.1.0.16
        tag_sync_main_to_dev6-4: 1.1
        tag_sync_2_0_to_main-3: 1.1
        tag_sync_2_0B1_to_2_0-3: 1.1
        branch_dev7: 1.1.0.14
        branch_dev4: 1.1.0.12
        tag_sync_main_to_dev7-1: 1.1
        branch_dev2: 1.1.0.10
        tag_sync_2_0_to_main-2: 1.1
        tag_sync_2_0B1_to_2_0-2: 1.1
        tag_sync_main_to_dev2-15: 1.1
        tag_sync_dev3_to_dev4-13: 1.1.6.1
        branch_dev1: 1.1.0.8
        branch_dev3: 1.1.0.6
        tag_sync_main_to_dev3-13: 1.1
        tag_sync_main_to_dev1-10: 1.1
        tag_sync_2_0_to_main-1: 1.1
        tag_sync_2_0B1_to_2_0-1: 1.1
        base_branch_2_0B1_200602171755: 1.1
        base_branch_2_0_200602171755: 1.1
        branch_2_0B1: 1.1.0.4
        branch_2_0: 1.1.0.2
keyword substitution: kv
total revisions: 8;     selected revisions: 8
description:
----------------------------
revision 1.1
date: 2006/02/18 00:45:58;  author: user1;  state: Exp;
branches:  1.1.6;  1.1.8;  1.1.10;  1.1.12;  1.1.14;  1.1.16;  1.1.18;
----------------------------
revision 1.1.18.1
date: 2006/02/28 18:35:08;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev5
>From tag: tag_sync_main_to_dev5-9
To tag:   tag_sync_main_to_dev5-10
----------------------------
revision 1.1.16.1
date: 2006/02/27 21:49:30;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev6
>From tag: tag_sync_main_to_dev6-3
To tag:   tag_sync_main_to_dev6-4
----------------------------
revision 1.1.14.1
date: 2006/02/23 23:16:00;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev7
>From tag: base_branch_dev7_200602070900
To tag:   tag_sync_main_to_dev7-1
----------------------------
revision 1.1.12.1
date: 2006/02/23 21:18:13;  author: user2;  state: Exp;  lines: +0 -0
Sync branch_dev3 to branch_dev4
>From tag: tag_sync_dev3_to_dev4-12
To tag:   tag_sync_dev3_to_dev4-13
----------------------------
revision 1.1.10.1
date: 2006/02/23 03:07:06;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev2
>From tag: tag_sync_main_to_dev2-14
To tag:   tag_sync_main_to_dev2-15
----------------------------
revision 1.1.8.1
date: 2006/02/22 21:52:17;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev1
>From tag: tag_sync_main_to_dev1-9
To tag:   tag_sync_main_to_dev1-10
----------------------------
revision 1.1.6.1
date: 2006/02/22 21:38:44;  author: user2;  state: Exp;  lines: +0 -0
Sync main to branch_dev3
>From tag: tag_sync_main_to_dev3-12
To tag:   tag_sync_main_to_dev3-13
=============================================================================

Here's is a cvs status on the file after performing the -r branch_dev2
-D "2006-02-20 00:00" checkout:

===================================================================
File: file.xml      Status: Needs Patch

   Working revision:    1.1
   Repository revision: 1.1.10.1        /cvs/myos/file.xml,v
   Sticky Tag:          branch_dev2 (branch: 1.1.10)
   Sticky Date:         (none)
   Sticky Options:      (none)

Any ideas?

I did find a similar problem, but that had to do with a file added to a
branch, not the trunk. The problem existed in 1.11.17, but was supposed
to be fixed in 1.11.18 and later.

Thanks, Greg.
-- 
Greg Kilfoyle <address@hidden>