-
Notifications
You must be signed in to change notification settings - Fork 6
Home
maki edited this page Oct 5, 2013
·
6 revisions
Run this script.
#!/bin/bash
git_url=git://github.com/maki-rxrz/gpac.git
work_dir=gpac_git
# clone
git clone $git_url $work_dir
cd $work_dir
# setup svn remotes
git svn init --prefix=svn/ svn://svn.code.sf.net/p/gpac/code --trunk=trunk/gpac
test -d .git/refs/remotes/svn || mkdir .git/refs/remotes/svn
git rev-list origin/plain -1 > .git/refs/remotes/svn/trunk
git svn fetch
# setup github remotes
git remote add -f github/golgol7777 git://github.com/golgol7777/gpac.git
git remote add -f github/wipple-old git://github.com/wipple/GPAC-old.git
git remote add -f github/wipple git://github.com/wipple/gpac.git
Example of merge procedure.
1. Update svn remotes and replace plain branch.
git svn fetch
git branch plain remotes/svn/trunk --force
2. Merge latest update into master branch.
git checkout master
git merge plain
Example of change the base revision.
1. Update svn remotes and replace plain branch.
git svn fetch
git branch plain remotes/svn/trunk --force
2. Replace master branch and apply patches.
git checkout master
git reset --hard plain
git cherry-pick origin/plain..origin/master