Commit graph

14 commits

Author SHA1 Message Date
Ryan Liptak
9b1378de8a Fix silly syntax error 2018-02-02 21:47:12 -08:00
Ryan Liptak
14fb258a66 Update svn after each merge commit to avoid error
svn: E195020: Cannot merge into mixed-revision working copy [15152:15153]; try updating first
2018-02-01 22:33:12 -08:00
squeek
9b7ac77151 Fix github-svn-mirror.sh trying to merge revisions twice
* Now starts merging at working copy revision + 1
2014-12-10 00:24:08 -08:00
squeek
4f67b3bcdc chmod +x github-svn-mirror.sh 2014-12-09 23:28:19 -08:00
squeek
a9e80854f9 Add another attempt at a script for mirroring git commits to an svn repo without shared history
* Uses the Github SVN mirror to try to avoid line ending conflicts
2014-12-08 02:01:20 -08:00
squeek
3e85f68c5d Remove --allow-empty option from cherry-pick 2014-11-12 14:58:28 -08:00
squeek
5462597156 Enforce unix line endings 2014-11-12 14:40:41 -08:00
squeek
3ae951992c chmod +x git-mirror-to-svn.sh 2014-11-12 14:31:42 -08:00
squeek
fd626aa7a7 Add script for mirroring git commits to an svn repo without shared history
* Will cherry pick the specified commits from git and commit them to the svn
2014-11-12 14:16:00 -08:00
squeek
6b68dd0867 Fix my brain not working right 2014-11-11 18:23:52 -08:00
squeek
50b5412c15 Make git-repository-from-svn.sh executable 2014-11-11 18:21:58 -08:00
squeek
7b559f739f Fix checking for local git server 2014-11-11 18:17:35 -08:00
squeek
6537ae771e Allow using a remote git repo and don't assume the svn is write-protected
* The git hooks to trigger the sync will have to be setup independently
2014-11-11 18:03:38 -08:00
Mario Fernandez
4c12f4021f Initial commit with the scripts to synchronize git with svn
This contains multiple scripts:
 - A script to synchronize an existing git repository with subversion
   via a git synch client
 - hooks for the git server to trigger the sync after a push
 - a hook for the client to reject every manual change
 - A script to create a new git server repository, along with the git
   synch client, starting from an existing subversion repository.
2012-05-30 11:58:42 +02:00