Re: git-cvsimport "you may need to merge manually"

From: smurf@smurf.noris.de <smurf@smurf.noris.de>
Date: Mar 17, 2006, 07:26 UTC
Message-ID: <20060317072602.GH14562@smurf.noris.de>
In-Reply-To: <86fylh20x6.fsf@blue.stonehenge.com>

Hi,

Randal L. Schwartz:

> Yeah, this doesn't make sense.  It used to "Just Work".  I can
> certainly add "git reset --hard" to my workflow, if that's the real
> work around.  And if so, the manpage should document that.
>

The real workaround is not to import into live branches, which is not a git-cvs-specific problem, so I didn't add that to its manpage.

I'm not opposed to an appropriate patch if you think its necessary. If you do, keep in mind that there are other git-*import scripts out there which presumably have the same problem. ;-)

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
That which is good to be done, cannot be done too soon; and if it is
neglected to be done early, it will frequently happen that it will not be done
at all.
					-- Bishop Mant