[MPlayer-dev-eng] [PATCH] description of DVD auth, VCD/DVD structure in cd-dvd.html

[Dominik Mierzejewski]

On Sunday, 27 October 2002, Jonas Jermann wrote:
> Hi
[...] 
> Strange, I entered cvs diff -u cd-dvd.html > dvd_auth.txt ....
> I still do not understand cvs in this area. Sometimes (this time 
> too actually) it changes my modified files and adds things like 
> ">>> ....".

These appear when CVS tries to solve a conflict and fails.

> I had to remove them manually as I lost the old file
> :(( IMHO cvs shouldn't change anything modified unless it has 
> been told to do so....

You should always do cvs update before creating diffs.

-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"