-
Notifications
You must be signed in to change notification settings - Fork 0
/
README
98 lines (61 loc) · 3.03 KB
/
README
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
OpenPilot http://openpilot.org Corvus Corax 2011-03-01
===============================================================================
This is an experimental GIT repository of the OpenPilot project.
OpenPilot is free software, see LICENSE.txt for details.
===============================================================================
This GIT repository is an auto updated mirror of our subversion repository and
is read-only! Any code changes have to be submitted to the subversion
repository directly via "git svn dcommit". Any such changes to subversion will
automatically be applied to this repository and can be pulled from their
branches.
I. Read only Access:
===============================================================================
For read-only access clone this repository with
git clone git://github.com/CorvusCorax/OpenPilot.git
Then checkout the branch holding our subversion development trunk with
git checkout trunk
You can pull the latest changes to your current branch from this git repository
with
git pull --rebase
II. Developer Access:
===============================================================================
To commit changes to the OpenPilot repository you need write access to
subversion. Code developed in a local git repository can be committed to
subversion with
git svn dcommit
For that to work your working repository needs to be "linked" to subversion.
There are two options:
Option 1:
Create a new repository linked to subversion with
git svn clone -s svn://svn.openpilot.org/OpenPilot
Be aware that this is a lengthy process and will take several hours.
Option 2:
Link your clone of this git repository to subversion
1. Add the following lines to your .git/config file:
===<snip>===========================
[svn-remote "svn"]
url = svn://svn.openpilot.org/OpenPilot
fetch = trunk:refs/remotes/trunk
branches = branches/*:refs/remotes/*
tags = tags/*:refs/remotes/tags/*
===</snip>==========================
2. Update the master branch to the latest revision
git checkout master;
git pull --rebase;
3. Copy the contents of the "git" sub folder in "master" into your own .git
folder. This will give you correct revision history to the latest subversion
revision.
Your git repository is now linked to subversion int the same way, a
repository created with "git svn clone" would be. You can make future updates
to your working branch either with
git svn rebase
or by pulling the changes from the repository on github with
git pull --rebase
If you use the second option iexclusively, it is highly recommended to update
your subversion reference files by repeating step 2 and 3 prior to any
dcommit. You can automate this by executing the script mentioned below.
===============================================================================
On a system with a working BASH interpreter, you can automate linking your
repository to subversion by executing
./link_to_subversion.sh
in this directory.