Merge lp:~tom.prince/twisted-trac-integration/git-mirror-instructions into lp:twisted-trac-integration

Proposed by Tom Prince
Status: Merged
Merged at revision: 84
Proposed branch: lp:~tom.prince/twisted-trac-integration/git-mirror-instructions
Merge into: lp:twisted-trac-integration
Diff against target: 37 lines (+7/-3)
2 files modified
svn-hooks/git/README (+5/-1)
svn-hooks/git/config (+2/-2)
To merge this branch: bzr merge lp:~tom.prince/twisted-trac-integration/git-mirror-instructions
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Approve
Review via email: mp+158731@code.launchpad.net

Description of the change

Updates the mirror location to be https://github.com/twisted/twisted and adds some more detail about how to deploy it.

There is a sudoers line to add (untested). And the key needs to be added to github.

To post a comment you must log in.
Revision history for this message
Tom Prince (tom.prince) wrote :

exarkun also suggest moving the scratch git repo out of the /svn/Twisted/hooks/git. (At least rsync is unhappy with it)

Revision history for this message
Jean-Paul Calderone (exarkun) wrote :

Merged the branch, also moved the git stuff (for some reason I had the impression the toolchain required it to be in the svn hooks directory, but finding no evidence of that I decided to try having it elsewhere).

Revision history for this message
Jean-Paul Calderone (exarkun) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'svn-hooks/git/README'
2--- svn-hooks/git/README 2013-03-08 18:20:54 +0000
3+++ svn-hooks/git/README 2013-04-12 23:13:30 +0000
4@@ -8,8 +8,12 @@
5
6 # fetch from svn and push to public mirror
7 # expects ./deploy-key to be a ssh-key with access to public repo
8+# i.e. add it to https://github.com/twisted/twisted/settings/keys
9 ./fetch
10
11-
12 # ssh script which uses ./deploy-key
13 ./deploy-ssh
14+
15+# Anybody who commits needs to be able to run the fetch script
16+# The following sudoers line should be the correct thing on wolfwood
17+%cvs-twisted ALL = (git-mirror) NOPASSWD: /usr/bin/env -i /svn/Twisted/hooks/git/fetch
18
19=== modified file 'svn-hooks/git/config'
20--- svn-hooks/git/config 2013-03-08 18:33:32 +0000
21+++ svn-hooks/git/config 2013-04-12 23:13:30 +0000
22@@ -19,13 +19,13 @@
23 url = .
24 push = refs/svn/*:refs/mirror/*
25 [remote "mirror"]
26- url = git@github.com:tomprince/twisted.git
27+ url = git@github.com:twisted/twisted.git
28 push = refs/mirror/*:refs/heads/*
29 push = refs/heads/trunk
30 push = refs/tags/*
31 push = refs/heads/releases/*
32 [remote "fetch"]
33- url = https://github.com/tomprince/twisted.git
34+ url = https://github.com/twisted/twisted.git
35 fetch = refs/heads/*:refs/svn/*
36 fetch = refs/heads/trunk:refs/heads/trunk
37 fetch = refs/tags/*:refs/tags/*

Subscribers

People subscribed via source and target branches

to all changes: