Loading...
 

Commit to a proposals branch

This will soon be deleted because we no longer will be using proposals branches


Related: Quality Team

  1. Checkout the code from the proposed branches
    Checking out the new stable directory (6.x)
    svn checkout http://svn.code.sf.net/p/tikiwiki/code/branches/proposals/6.x .

  2. Merge specific commit from trunk or other branch
    Merge revision 19139 from trunk
    svn merge -r19138:19139 ^/trunk


    Merge revision 35100 from branch 7.x
    svn merge -r35099:35100 ^/branches/7.x


    The cherry picking method can also be used. First check you have the good commit by running a diff, then merge the commit

    Cherry picking 19139
    svn diff -c 19139 ^/trunk
    svn merge -c 19139 ^/trunk

  3. Test
    Solve any conflict
    Test tikiwiki - It is a good idea to have proposals branches installed and operational.
    Be very careful to avoid regressions.
    Some useful svn tools
    #To see what will be commit
    svn diff | more
    #To pick again the version in trunk of this_file
    svn revert this_file
    #After conflict and edition, to tell svn that the version in proposed is the good one (commands depend on svn version
    svn revolved this_file
    svn resolve --accept working this_file

  4. Commit
    svn commit -m "[bp/r19139][FIX] Mindmap was broken by changes to the flash plugin" tiki-mindmap.php

    It starts with "[bp/r19139]", which means that it is a backport of a fix/feature commited on trunk at revision 19139. 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...]


alias

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