# BRANCHES 
# this file documents the official branches and where they merge to
# all branches must merge eventually to trunk
# this is used by releng tools, such as tomerge
#
# each line is a merge order
# from			to
#
# project branches should have two rules
# one from the baseline out to the project branch so that we keep it up to date
# and a second for merging it back in as a reminder to reintegrate
#
# these are the major active branches
#
rel_2_5			trunk
win_2_4			win_2_5
win_2_5			trunk
#
#project branch
dolby			rel_2_5
#
# manufactiring branch
LTC_2010		trunk
jlm_280			trunk
# 
# zinc_beta5		trunk
#
# project branch for multibox management 
# started by Eric
# owned by Jeff
# all retired
# trunk jb_multiboxmgt
# jb_multiboxmgt	trunk
# merge out
# trunk/lcast jb_multiboxmgt_lcast_new
# temporary build branch
# jb_multiboxmgt_lcast_new jb_multiboxmgt_5/lcast
# merge in
# jb_multiboxmgt_lcast_new trunk/lcast
# new branch for bug fixes to the single threaded client
cli_3_0_single trunk
# 
# recently retired
#
# moved down here for convenience
#
rel_2_2_1		rel_2_5
rel_2_4			rel_2_5
rel_2_3			rel_2_2_1
jlm_sp16		trunk
es_bug3361		rel_2_2_1
es_bug3426		rel_2_2_1
es_bug3266		rel_2_2_1
es_bug2355		rel_2_2_1
es_display		rel_2_2_1
# jlm_branding_221	jlm_branding_win24
jlm_branding_221	rel_2_4
jlm_branding_win24	win_2_4
cli_2_3			trunk
cli_2_4			trunk
#
# Lines from here down keep old branches from spitting out warnings
# THEY ARE NOT CHECKED
# so when in doubt, leave them as real merges
#
es_bug3321	ABANDONED
#
# retired branches
b2909	retired
BB_2_3_0	retired
bb_cli_2_4	retired
blackbox_cli_2_3	retired
buildtest	retired
burnin	retired
CES	retired
DigitalHollywood	retired
DVT2	retired
es_bug3351	retired
es_bug3352	retired
es_bug3399	retired
es_zvb_reset	retired
feedmenuunification	retired
guimgr	retired
IMS2	retired
IMS_sp16	retired
jag_br1	retired
jlm_2_2_cli	retired
jlm_driver	retired
jlm_test	retired
lcast_1.2	retired
LTC2008-09	retired
merge_221	retired
online	retired
patch101	retired
patch102	retired
peabody	retired
preview_patch	retired
R0.4	retired
R0_6	retired
rapidev1.0.4	retired
rapidev2.2	retired
rel_2_1	retired
rel_2_1_1	retired
rel_2_1_2	retired
rel_2_2	retired
release_2.0	retired
teknision	retired
televideo_2.0	retired
uboot1.1	retired
zincb3_2_content_release_2	retired
zinc_beta3	retired
zinc_beta4	retired
zinc_beta5_patch1	retired
zinc_branding_release	retired
zinc_ff36	retired
zviewer_beta1	retired
zviewer_beta2_zinc	retired
zviewer_beta3	retired
zviewer_reorg	retired
ZVviewer_fullTextSearch	retired
