[Flightgear-devel] Re: [Simgear-cvslogs] CVS: SimGear/simgear/math .cvsignore, [...]

[Melchior F. <mf...@ao...>]

* Melchior FRANZ -- Tuesday 21 February 2006 11:11:
> It wasn't a script. It was all hand-made and verified multiple
> times. The patch was correct. Only: it had no context lines (my
> fault), and Erik installed it over files with uncommitted changes,
> and committed it in one go.

But, no. This doesn't explain it. The context lines are only there
to allow cvs to resolve minor conflicts *automatically*. But there
should still conflicts have been reported while committing. After all,
the '-' line has to match at exactly the right line number, to
be replaced by the '+' line. So I change my mind: it can't have been
my fault. Hmmm ...

m.