[MPlayer-DOCS] [PATCH] XviD documentation reaching almost completeness

[D Richard Felker III]

On Wed, Sep 08, 2004 at 10:02:10AM +0200, Guillaume POIRIER wrote:
> Hi there
> Le mar 07/09/2004 à 21:28, Diego Biurrun a écrit :
> > On Tue, Sep 07, 2004 at 04:25:47PM +0200, Guillaume POIRIER wrote:
> > > 
> > > Plus I had trouble keeping my patch "commit-able" against latest cvs, so
> > > I'm looking forward this is over ;-)
> > 
> > Do you edit your patch directly?
> 
> Usually, I don't, and work directly on the file I checked out, on the
> tree. But there has been many commits on the man page meanwhile, so my
> copy was outta sync, and couldn't make a good patch.
> 
> That's why I edited the patch directly... but it looks like it's not a
> good idea. Last time I read DOCS/tech/cvs-howto.txt, it read it was
> possible to edit patches, so I figured it was ok for me too.

yes, it's possible. emacs will even automate part of it for you
(updating the line numbering and stuff so it's still a valid patch).

> So tell me: If I just keep on working on my local cvs tree, is cvs
> clever enough to merge the changes, as long as they don't touch the same
> lines? (it would have saved a lot of my time)... having a closer look to
> the doc, it seems like it...

yes. just cvs update the file and it will merge the changes. if merge
fails, both versions will be left in the file with <<<<< and >>>>>
around them for you to sort out.

rich