Loading...
 

Merge a commit from trunk

Say you commit a fix to a trunk (ex.: future 9x), and you want to merge that commit to the stable branch (ex.: 8x).

Since this merge is from a later version (9x) to a older version, it is called a “backport”. You can also backport someone else’s fix :-)

In this example, we’ll merge the commit in from trunk (revision 38634) to 8x

  1. Checkout 8x -> get code
  2. From the 8x directory (you may have to do ‘cd 8x’)
    Merge revision from trunk to the current checkout)
    svn merge -c 38634 ^/trunk

    If you are backporting from a branch (if this case from 12.x to 11.x)
    svn merge -c 48272 ^/branches/12.x
  3. Test your commit. Be very careful to avoid regressions (This is the stable branch!)
  4. To see what will be committed
    svn diff | more

    If you see many conflicts, it’s not a good idea to backport. It means the code has diverged too much.

    In that case you can revert recursively from the top of your working copy:
    svn revert -R .
  5. Commit
    svn commit -m "[bp/r38634] [FIX] Apparently glob(), this can fail on some systems, check required" lib/init/tra.php

    It starts with “[bp/r38634]”, which means that it is a backport of a fix/feature commited on trunk at revision 38634. Then it is followed by the original commit message made on trunk. If multiple commits has been made on trunk to fix the same issue, they have to be proposed as one unique commit and the commit message will have multiple lines starting with [bp/r...]



Related:


Other pages related to merging:
10 pages found for title search ‘merg


alias

Merge a commit to a stable branch | Backport to a stable branch | Backport

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.

Accessibility (WAI & 508)
Accounting 7.x
Administration
Ajax 2.x
Articles & Submissions
Backlinks
Banner
Batch 6.x
BigBlueButton audio/video/chat/screensharing (5.x)
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution 2.x
Cookie
Copyright
Credits 6.x
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs 8.x
DogFood
Draw 7.x
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Group
Help
History
Hotword
HTML Page
i18n (Multilingual, l10n, Babelfish)
Image Gallery
Import-Export
Install
Integrator
Interoperability
Inter-User Messages
InterTiki
jQuery
Kaltura video management
Karma
Live Support
Logs (system & action)
Lost edit protection
Mail-in
Map
Menu
Meta Tag
Missing features
Visual Mapping 3.x
Mobile Tiki and Voice Tiki
Mods
Modules
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Organic Groups (Self-managed Teams)
Payment 5.x
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Realname
Report
Revision Approval
Score
Search engine optimization (SEO)
Search
Security
Semantic links 3.x
Share
Shopping Cart 5.x
Shoutbox
Site Identity
Slideshow
Smarty Template
Social Networking
Spam protection (Anti-bot CATPCHA)
Spellcheck
Spreadsheet
Staging and Approval
Stats
Survey
Syntax Highlighter (Codemirror)
Tablesorter
Tags 2.x
Task
Tell a Friend, alert + Social Bookmarking
Terms and Conditions
Theme
TikiTests 2.x
Timesheet
Token Access
Toolbar (Quicktags)
Tours
Trackers
TRIM
User Administration
User Files
User Menu
Watch
WebHelp
Webmail and Groupmail
WebServices 3.x
Wiki 3D
Wiki History, page rename, etc
Wiki plugins extends basic syntax
Wiki syntax text area, parser, etc
Wiki structure (book and table of content)
Workspace and perspectives 4.x
WYSIWTSN 4.x
WYSIWYCA
WYSIWYG 2.x
XMLRPC




Useful Tools