[Issue 251] New - Missing merges

https://ccvs.cvshome.org/issues/show_bug.cgi?id=251
                 Issue #|251
                 Summary|Missing merges
               Component|ccvs
                 Version|1.11.14
                Platform|All
                     URL|
              OS/Version|Linux
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|diff library
             Assigned to|issues@ccvs
             Reported by|agoodno






------- Additional comments from [email protected] Wed Jun  1 12:23:22 -0700 2005 -------
We have become aware files that should have merged in our morning automated
merge process and didn't merge for some reason.  Our merge process is:

In a local workspace:
1) Do a 'cvs -q update -d -P' in each branch workspace to update it
2) Do a 'cvs -q update -d -j "Branch02_3X:2005-05-05 05:01:00" -j
"Branch02_3X:2005-05-06 05:01:00"' in the Trunk workspace to merge it
3) Do a 'cvs -q status' to check for conflicts
4) Fix the conflicts
5) Do a 'cvs -q commit -m "Merged from Branch"' to commit all merged files

Even though there have been changes to (let's say) 10 files changed on the
Branch, step #2 only registers 8 changed files, so only merges 8 files.  In
fact, we have a case of two different files commited on the Branch on 3/24/2005.
 This first file at 8:30am, the second file at 9:30am.  The first was merged and
the second was missed.  There doesn't appear to be any commonality to the files
that are missed and it happens rarely.  Let me know if you need more info.

Andy