Re: [AD] modex+dither bugfix

[Eric Botcazou <ebotcazou@xxxxxxxxxx>]

> Sorry for my ignorance, but how do I commit to both "mainline and 4_0
> branch"?

You have to do two commit operations: on mainline, it's as usual. For the 
branch, you must first retrieve the file from the branch:
   cvs update -rallegro_4_0_branch src/blit.c
   patch < ...
   cvs commit src/blit.c

To resync with mainline
   cvs update -A src/blit.c

This works for a single file, but is obviously inefficient for several files. 
So the best solution is the keep two trees in parallel, the first one synced 
on mainline, the second one on the 4_0 branch.

To retrieve a tree synced on a branch, it's as usual except that the 'co' 
(checkout) command must specify the branch tag:
cvs co -rallegro_4_0_branch

Branch tags are sticky so you are guaranteed to stay on the same branch as 
long as your never use -r and -A.

> In another thread, you said I can commit to "mainline and branch", what
> does that mean?

It's the same branch. I used 4_0 branch because there is now an 
allegro_console_branch.

-- 
Eric Botcazou