vb.org Archive - View Single Post - using git / svn and dealing with version no

squidsk · #5 01-22-2016, 04:52 PM

Quote:

Originally Posted by ub.ch

can you give more detail? Because for me it does not work

You need to setup two git repositories, though in theory it should work with 2 branches in the same repository. One repository/branch is solely for committing changes to vBulletin (i.e. upgrades) the other repository/branch is where your customizations are committed. When you apply an upgrade to the first repository/branch you then fetch it to the second and apply a git rebase to have your customization applied to the new "base" code.

I finished the article and have submitted it for approval with staff.

--------------- Added [DATE]1453494919[/DATE] at [TIME]1453494919[/TIME] ---------------

If you wanted to continue using svn you could do a similar thing where the vbulletin commits are on the trunk line and your changes are on a branch. Every time you commit a new vbulletin version to the trunk do an svn merge to your branch to upgrade you customizations to the new versions of svn.

X vBulletin 3.8.12 by vBS Debug Information
Page Generation 0.01153 seconds Memory Usage 1,767KB Queries Executed 11 (?)
More Information
Template Usage: (1)SHOWTHREAD_SHOWPOST (1)ad_footer_end (1)ad_footer_start (1)ad_header_end (1)ad_header_logo (1)ad_navbar_below (1)bbcode_quote (1)footer (1)gobutton (1)header (1)headinclude (6)option (1)post_thanks_box (2)post_thanks_box_bit (1)post_thanks_button (1)post_thanks_javascript (1)post_thanks_navbar_search (1)post_thanks_postbit (1)post_thanks_postbit_info (1)postbit (1)postbit_onlinestatus (1)postbit_wrapper (1)spacer_close (1)spacer_open Phrase Groups Available: global postbit reputationlevel showthread	Included Files: ./showpost.php ./global.php ./includes/init.php ./includes/class_core.php ./includes/config.php ./includes/functions.php ./includes/class_hook.php ./includes/modsystem_functions.php ./includes/functions_bigthree.php ./includes/class_postbit.php ./includes/class_bbcode.php ./includes/functions_reputation.php ./includes/functions_post_thanks.php Hooks Called: init_startup init_startup_session_setup_start init_startup_session_setup_complete cache_permissions fetch_postinfo_query fetch_postinfo fetch_threadinfo_query fetch_threadinfo fetch_foruminfo style_fetch cache_templates global_start parse_templates global_setup_complete showpost_start bbcode_fetch_tags bbcode_create postbit_factory showpost_post postbit_display_start post_thanks_function_post_thanks_off_start post_thanks_function_post_thanks_off_end post_thanks_function_fetch_thanks_start fetch_musername post_thanks_function_fetch_thanks_end post_thanks_function_thanked_already_start post_thanks_function_thanked_already_end post_thanks_function_fetch_thanks_bit_start post_thanks_function_show_thanks_date_start post_thanks_function_show_thanks_date_end post_thanks_function_fetch_thanks_bit_end post_thanks_function_fetch_post_thanks_template_start post_thanks_function_fetch_post_thanks_template_end postbit_imicons bbcode_parse_start bbcode_parse_complete_precache bbcode_parse_complete postbit_display_complete post_thanks_function_can_thank_this_post_start showpost_complete
Messages:

2 благодарности(ей) от:
MarkFL, ub.ch