[XviD-devel] [RELEASE] XviD 0.9.1 taged on CVS

Edouard Gomez ed.gomez at free.fr
Sat Feb 15 00:47:33 CET 2003


Edouard Gomez (ed.gomez at free.fr) wrote:
> Merging is clearly impossible, there are conflict for all the files. So
> nice merging will not be possible. I propose a nasty solution that is
> based on a method that proves to be efficient :-):
>  - cvs checkout -r dev-api-3
>  - cvs checkout
>  - copy files from dev to stable
>  - add new files from dev to stable
>  - commit all changes at once - tag the tree
>  - repeat until all is working
>  - All done -- every one is happy :)
> 
> Drawbacks: I can break all the stuff, to avoid that i'll process on an
> atomic approach, commiting all at once until it works and using
> temporrary tags to be able to delete things easily (cvs admin -o
> merging-tmp).
> 
> If nobody is against that, i would like that nobody commit a change to
> CVS tomorrow starting from 6pm GMT to avoid clashes and forgoten patches
> in dev-api-3.

Hmmm, I've  been busy  with other stuff,  doing lot of  personal backup,
sorry. Btw I'll use arch to help me doing things on my own tree (because
it  handles  rename/moving operations  an  so  on)  so you  can  coninue
commiting. I'll do like the build process patch, i'll commit only when i
have my own tree completely merged. Will be ready befaore the end of the
week end.

-- 
Edouard Gomez-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://edu.bnhof.de/pipermail/xvid-devel/attachments/20030215/99aba382/attachment.bin


More information about the XviD-devel mailing list