Re: [Evolution-hackers] Merge from head to gnome-2-8 branch.

[JP Rosevear <jpr novell com>]

On Thu, 2004-09-16 at 22:52 +0800, Not Zed wrote:
> 
> Hi all,
> 
> Ok, the merge from HEAD back to the gnome-2-8 branch is done for eds
> and evolution.
> 
> There are a few tags which 'mark this spot'.
> 
> evolution-2-0-1-merge-start - the point on HEAD from which the code
> was merged to gnome-2-8 branch.
> evolution-2-0-1-merge - the point on the gnome-2-8 branch where it was
> merge to (pre-merge - should match 2.0.0 but doesn't for some files).
> 
> eds-1-0-1-merge-start
> eds-1-0-1-merge - the same as above for evolution-data-server module.

Done for gal using gal-2-2-2-merge-start and gal-2-2-2-merge as above
(we released gal 2.2.1 with GNOME 2.8.0).

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.