Loading...
 

How to rescue a commit lost from SVN on 2018-04-10

We've lost commits from revisions 65976 to 65991 due to a problem in SF. Those commits remained at git repository and were backed up at https://gitlab.com/lfagundes/tiki.

This document shows how to generate a patch from that git repository and apply on SVN to recover a commit.

Make a shallow clone of the git repository

git clone --depth 20 git@gitlab.com:lfagundes/tiki.git tiki-lost
cd tiki-lost


This will fetch only 20 last revisions from master (trunk). If you need to get commits from a branch:

git remote set-branches 18.x
git fetch --depth 20 origin 18.x
git checkout 18.x

Generate a patch

Now look at the commit that was lost. Copy the SHA1 commit id of that revision, and the one before that. Then generate a patch:

# Use proper IDs below
git diff 3d4de13f3eb3c7d174add16260bc495a470b0513 b2f2899b09294990ea880bc9ec4b2e3ebe2db340 > rev65992.patch

Apply the patch

Now go to the SVN working copy and apply that patch:

patch -p1 < somewhere/tiki-lost/rev65992.patch
svn commit


Contributors to this page: Luis Henrique Fagundes .
Page last modified on Thursday 12 April, 2018 17:16:14 GMT-0000 by Luis Henrique Fagundes.

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
Administration
Ajax
Articles & Submissions
Backlinks
Banner
Batch
BigBlueButton audio/video/chat/screensharing
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution
Cookie
Copyright
Credits
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Diagram
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs
DogFood
Draw -superseded by Diagram
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Gantt
Group
Groupmail
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
Mobile
Mods
Modules
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Organic Groups (Self-managed Teams)
Packages
Payment
PDF
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Realname
Report
Revision Approval
Scheduler
Score
Search engine optimization (SEO)
Search
Security
Semantic links
Share
Shopping Cart
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
Task
Tell a Friend
Terms and Conditions
Theme
TikiTests
Timesheet
Token Access
Toolbar (Quicktags)
Tours
Trackers
TRIM
User Administration
User Files
User Menu
Watch
Webmail and Groupmail
WebServices
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
WYSIWTSN
WYSIWYCA
WYSIWYG
XMLRPC
XMPP




Useful Tools