git-cvsimport "you may need to merge manually"

From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Mar 17, 2006, 02:37 UTC
Message-ID: <86veud23v0.fsf@blue.stonehenge.com>

Starting recently, git-cvsimport has always ended with "you may need to merge manually". Why? It worked before. What is it doing now?

    $ cd /home/merlyn/Git/stonehenge.git || exit 1
    $ git-cvsimport -v -k -o master -d /web/cvs stonehenge
    .
    .
    .
    skip patchset 323: 1142297290 before 1142351976
    Fetching htdocs/courses.html   v 1.4
    Update htdocs/courses.html: 8767 bytes
    Fetching htdocs/rates.html   v 1.2
    Update htdocs/rates.html: 2043 bytes
    Tree ID 38280334da5eaa4fd80fe1011e63db4b527f1d13
    Parent ID e93de754181fe963b8623423f509540021caead0
    Committed patch 324 (master 2006-03-16 18:14:31)
    Commit ID 985ca72d4e8a07d4189794231f035bac63c9e91d
    DONE; you may need to merge manually.
    $ git-status
    #
    # Updated but not checked in:
    #   (will commit)
    #
    #       modified: htdocs/courses.html
    #       modified: htdocs/rates.html
    #

Right... why didn't it commit those? I'm having to issue "fake" commits now, so I've lost the cvs-log comments that were formerly very complete and cool.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!