[dokuwiki] Re: Migration from DokuWiki 2010-11-07 "Anteater" to latest in HEAD
- From: Markus Hitter <mah@xxxxxxxxxxx>
- To: dokuwiki@xxxxxxxxxxxxx
- Date: Mon, 20 Jun 2016 18:32:07 +0200
Am 20.06.2016 um 17:38 schrieb Dmitry Katsubo (Redacted sender dma_k for
DMARC):
I am trying to perform the migration of DokuWiki "Anteater" (I will call it "old" wiki
further) to latest in Git HEAD (I will name it "new" wiki).
Not a solution for one of the particular problems, but a more general
strategy is to start with the Git repo checked out to this old version.
Then put your current wiki into a branch off that old version. This
should give a working wiki, essentially the same as you had before.
Having your wiki in a branch allows to rebase that branch commit by
commit to see when the trouble starts. If the old version equals
master~320, rebase to master~319, then to master~318, then to master~317
and so on. Maybe in steps of 10 commits (320, 310, 300, ...). Going back
in history is possible, too, but requires using the --onto parameter.
In another project I use this strategy very often to get older
contributions up to date.
This snippet gives you the number behind the ~ (assumed to be 320 above):
BASE_BRANCH=master
git checkout my_own_wiki_branch
COMMON_PARENT=$(git merge-base HEAD ${BASE_BRANCH})
echo "Common parent is ${COMMON_PARENT}."
PARENTS=$(git rev-list ${COMMON_PARENT}..${BASE_BRANCH} | wc -l)
let PARENTS=${PARENTS}-1
echo "Start with: git rebase ${BASE_BRANCH}~${PARENTS}."
Markus
--
- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/
--
DokuWiki mailing list - more info at
http://www.dokuwiki.org/mailinglist
Other related posts:
