114 |
114 |
115 $ git commit -a -m "Added clean target." |
115 $ git commit -a -m "Added clean target." |
116 |
116 |
117 * Using git to work with SVN offline. |
117 * Using git to work with SVN offline. |
118 |
118 |
|
119 Prepare SVN and git utilities: |
|
120 |
119 $ sudo apt-get svn git-core git-svn |
121 $ sudo apt-get svn git-core git-svn |
120 $ |
122 |
|
123 Making SVN repo |
|
124 |
|
125 $ cd $HOME/tmp |
|
126 $ svnadmin create svn-repo |
|
127 $ svn co file://$HOME/tmp/svn-repo svn-devel |
|
128 $ cd svn-devel |
|
129 $ mkdir tags trunk branches |
|
130 $ svn add * |
|
131 A branches |
|
132 A tags |
|
133 A trunk |
|
134 $ cd trunk/ |
|
135 $ printf "all:\n echo XXX\n" >Makefile |
|
136 $ printf "int main() {return 0;}" >main.c |
|
137 $ svn add * |
|
138 $ cd .. |
|
139 $ svn st |
|
140 A trunk |
|
141 A trunk/main.c |
|
142 A trunk/Makefile |
|
143 A branches |
|
144 A tags |
|
145 $ svn ci -m init |
|
146 Adding branches |
|
147 Adding tags |
|
148 Adding trunk |
|
149 Adding trunk/Makefile |
|
150 Adding trunk/main.c |
|
151 Transmitting file data .. |
|
152 $ svn cp -m v0.0 file://$HOME/tmp/svn/trunk file://$HOME/tmp/svn/tags/v0.0 |
|
153 $ svn cp -m v0.1 file://$HOME/tmp/svn/trunk file://$HOME/tmp/svn/branches/v0.1 |
|
154 |
|
155 Moving SVN changset to git repo |
|
156 |
|
157 $ cd $HOME/tmp |
|
158 $ git svn init file://$HOME/tmp/svn git |
|
159 $ ls -a |
|
160 . .. .git |
|
161 $ git svn fetch |
|
162 A trunk/main.c |
|
163 A trunk/Makefile |
|
164 W: +empty_dir: branches |
|
165 W: +empty_dir: tags |
|
166 r1 = 52ccd9882979dd53ec198dbac108783ec660410f (git-svn) |
|
167 A tags/v0.0/main.c |
|
168 A tags/v0.0/Makefile |
|
169 r2 = 8ec8a772bb6f37ace56b3649066dc84e481ed427 (git-svn) |
|
170 M trunk/Makefile |
|
171 r3 = 2c169ff409ed504dd6a092b1e302beb3fd94871e (git-svn) |
|
172 A branches/v0.1/main.c |
|
173 A branches/v0.1/Makefile |
|
174 r4 = e68d76f4ba6beea4b9059c1884c1f38ce10831a7 (git-svn) |
|
175 M trunk/Makefile |
|
176 r5 = cdde63974454b13ac53f2eeb201aa76c49fd875c (git-svn) |
|
177 Checked out HEAD: |
|
178 file:///home/sasha/tmp/svn r5 |
|
179 |
|
180 Making changes in svn: |
|
181 |
|
182 $ cd $HOME/tmp/svn-devel/trunk |
|
183 $ echo ".PHONY: clean" >>Makefile |
|
184 $ svn ci -m "Added clean to phony." |
|
185 Sending trunk/Makefile |
|
186 Transmitting file data . |
|
187 Committed revision 6. |
|
188 |
|
189 Making committed in git: |
|
190 |
|
191 $ cd $HOME/tmp/git-repo/trunk |
|
192 $ echo ".PHONY: all" >>Makefile |
|
193 $ echo "int foo(int x) {return x+x;}" >>main.c |
|
194 $ git status |
|
195 # On branch master |
|
196 # Changed but not updated: |
|
197 # (use "git add <file>..." to update what will be committed) |
|
198 # |
|
199 # modified: Makefile |
|
200 # modified: main.c |
|
201 # |
|
202 no changes added to commit (use "git add" and/or "git commit -a") |
|
203 $ git commit -a -m "Bug fixed." |
|
204 Created commit 222d399: Bug fixed. |
|
205 2 files changed, 2 insertions(+), 0 deletions(-) |
|
206 |
|
207 Getting changes from SVN to git: |
|
208 |
|
209 $ git svn rebase |
|
210 M trunk/Makefile |
|
211 r6 = 8165e9bfb38e9df09a7313d19606ec227629b670 (git-svn) |
|
212 First, rewinding head to replay your work on top of it... |
|
213 Applying Bug fixed. |
|
214 error: patch failed: trunk/Makefile:6 |
|
215 error: trunk/Makefile: patch does not apply |
|
216 Using index info to reconstruct a base tree... |
|
217 Falling back to patching base and 3-way merge... |
|
218 Auto-merged trunk/Makefile |
|
219 CONFLICT (content): Merge conflict in trunk/Makefile |
|
220 Failed to merge in the changes. |
|
221 Patch failed at 0001. |
|
222 |
|
223 When you have resolved this problem run "git rebase --continue". |
|
224 If you would prefer to skip this patch, instead run "git rebase --skip". |
|
225 To restore the original branch and stop rebasing run "git rebase --abort". |
|
226 |
|
227 rebase refs/remotes/git-svn: command returned error: 1 |
|
228 $ git add Makefile |
|
229 $ git rebase --continue |
|
230 Applying Bug fixed. |
|
231 |
|
232 and return all from git to SVN: |
|
233 |
|
234 $ git svn dcommit |
|
235 Committing to file:///home/sasha/tmp/svn ... |
|
236 M trunk/Makefile |
|
237 M trunk/main.c |
|
238 Committed r7 |
|
239 M trunk/main.c |
|
240 M trunk/Makefile |
|
241 r7 = 68e782c8d06635f2db4dd69b9ca8599f99da22e2 (git-svn) |
|
242 No changes between current HEAD and refs/remotes/git-svn |
|
243 Resetting to the latest refs/remotes/git-svn |
|
244 |
|
245 See what going to SVN repo: |
|
246 |
|
247 $ cd $HOME/tmp/svn-devel/trunk |
|
248 $ svn diff -r BASE:HEAD |
|
249 Index: Makefile |
|
250 =================================================================== |
|
251 --- Makefile (working copy) |
|
252 +++ Makefile (revision 7) |
|
253 @@ -6,4 +6,4 @@ |
|
254 .o: .c |
|
255 $(CC) $(CFLAGS) -c -o $@ $< |
|
256 |
|
257 -.PHONY: clean |
|
258 +.PHONY: all clean |
|
259 Index: main.c |
|
260 =================================================================== |
|
261 --- main.c (working copy) |
|
262 +++ main.c (revision 7) |
|
263 @@ -2,3 +2,4 @@ |
|
264 { |
|
265 return 0; |
|
266 } |
|
267 +int foo(int x) {return x+x;} |
|
268 $ svn up |
|
269 U Makefile |
|
270 U main.c |
|
271 Updated to revision 7. |
|
272 |
|
273 |