# This file is sourced by lustre/lustrecvs
portalstag=""
-lnettag="HEAD"
+lnettag="b1_x"
libsysiotag="HEAD"
snmptag="HEAD"
ldiskfstag="HEAD"
+ldiskfstag_head="b1_8_iam"
+lustreiokittag="HEAD"
+libcfstag="b1_x"
dmutag=""
hg_base_url="http://www.wizy.org/mercurial"
# this is the branch table
# keep this list sorted alphabetically!
- # Note these are "specials" -- branches using lnet HEAD don't need an
+ # Note these are "specials" -- branches using lnet b1_x don't need an
# entry here.
b1_2)
portalstag="b_hd_newconfig"
;;
- b1_8)
- # b1_8 is an alias for HEAD.
- lustretag="HEAD"
- ldiskfstag="b1_8_iam"
- ;;
-
b_cmd*)
portalstag="$lustretag"
;;
# lnet "User Level Access" development branch
lnettag="b_ula"
lustretag="HEAD"
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
;;
# CMD3
-<<<<<<< buildcvs
- HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server)
-=======
- HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b_som)
->>>>>>> 1.111
+ b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_som|b_head_interop_disk)
# Update b1_8 above when changing this.
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
;;
+ #umds cleanup
+ b_hd_umds_cln2)
+ ldiskfstag="b1_8_iam_dynlock"
+ ;;
+
# uOSS
b_hd_dmu)
lnettag="b_uoss"
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
+ ;;
+
+ # uMDS
+ b_dmu_umds)
+ lnettag="b_uoss_umds"
+ ldiskfstag="$ldiskfstag_head"
dmutag="zfs-lustre"
;;
b_uoss_o2iblnd)
lnettag="b_uoss_o2iblnd"
lustretag="b_hd_dmu"
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
dmutag="zfs-lustre"
;;
# client io stack cleanup
b_client_io_layering)
- ldiskfstag="b1_8_iam"
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ # windows client porting (lustre: b_client_io_layering, lnet: HEAD)
+ b_winnt_port)
+ ldiskfstag="$ldiskfstag_head"
+ lnettag="$lustretag"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
snmptag="$lustretag"
;;
+ # Branches that have been updated to include
+ # the libcfs split should be added here
+ HEAD)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
# all later v* tags
v[1-9]*)
lnettag="$lustretag"
snmptag="$lustretag"
ldiskfstag="$lustretag"
;;
+
+ b_HEAD_*|b_head_*|b_hd_*)
+ lnettag="b1_x"
+ ldiskfstag="$ldiskfstag_head"
+ ;;
esac
cvs_cmd libsysio libsysio "$libsysiotag"
cvs_cmd snmp lustre-snmp "$snmptag"
cvs_cmd lustre lustre-core "$lustretag"
cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
-hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build