Re: Issue running git-svn-mirror script on code

2013-01-31 Thread Geert Janssens
On 31-01-13 04:49, John Ralls wrote: On Jan 30, 2013, at 6:44 AM, Geert Janssens wrote: On 28-01-13 18:44, Derek Atkins wrote: John Ralls writes: Is that what's in place now (except to a stand-in repo on code.gnucash.org instead of github)? There is no stand-in repo. The current end p

Re: Issue running git-svn-mirror script on code

2013-01-30 Thread John Ralls
On Jan 30, 2013, at 6:44 AM, Geert Janssens wrote: > On 28-01-13 18:44, Derek Atkins wrote: >> John Ralls writes: >> > Is that what's in place now (except to a stand-in repo on > code.gnucash.org instead of github)? There is no stand-in repo. The current end point is gitolite >>

Re: Issue running git-svn-mirror script on code

2013-01-30 Thread Geert Janssens
Status update: On 25-01-13 17:35, Derek Atkins wrote: Just for the record, the things left to do are: 1) get gitolite to push to github -- this will require a github reset Hook is ready. Whenever we reset github and set the proper origin remotes in our gitolite repos, all changes will be pushe

Re: Issue running git-svn-mirror script on code

2013-01-30 Thread Geert Janssens
On 28-01-13 18:44, Derek Atkins wrote: John Ralls writes: Is that what's in place now (except to a stand-in repo on code.gnucash.org instead of github)? There is no stand-in repo. The current end point is gitolite I never imagined a stand-in repo. In retrospect I understand now it can be

Re: Issue running git-svn-mirror script on code

2013-01-28 Thread Derek Atkins
John Ralls writes: >>> I guess the best way would be svn->gitolite->github, so when we drop svn >>> and start committing to gitolite directly we don't have to do anything. >> That is how it is planned indeed. For completeness, I'll just point out that >> the push to github (or any other stand-i

Re: Issue running git-svn-mirror script on code

2013-01-28 Thread Derek Atkins
Geert Janssens writes: > In order to do so, you will have to configure gitolite to look for > hooks in the gitolite-admin repo. Here's a starting point: > http://sitaramc.github.com/gitolite/cust.html#hooks > http://sitaramc.github.com/gitolite/cust.html#pushcode > > Basically, you set LOCAL_CODE

Re: Issue running git-svn-mirror script on code

2013-01-26 Thread John Ralls
On Jan 26, 2013, at 2:04 AM, Geert Janssens wrote: > On 25-01-13 20:19, John Ralls wrote: >> On Jan 25, 2013, at 9:43 AM, Geert Janssens >> wrote: >> >>> On 25-01-13 18:12, Derek Atkins wrote: I'm fine with this. I *may* have some time this weekend, but not a lot. I promised I'd u

Re: Issue running git-svn-mirror script on code

2013-01-26 Thread Geert Janssens
On 25-01-13 20:19, John Ralls wrote: On Jan 25, 2013, at 9:43 AM, Geert Janssens wrote: On 25-01-13 18:12, Derek Atkins wrote: I'm fine with this. I *may* have some time this weekend, but not a lot. I promised I'd use this weekend to clean up my office so I wont really be online much. I wo

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread John Ralls
On Jan 25, 2013, at 9:43 AM, Geert Janssens wrote: > On 25-01-13 18:12, Derek Atkins wrote: >> >> I'm fine with this. I *may* have some time this weekend, but not a >> lot. I promised I'd use this weekend to clean up my office so I wont >> really be online much. > I won't have time this weeke

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Geert Janssens
On 25-01-13 18:12, Derek Atkins wrote: I'm fine with this. I *may* have some time this weekend, but not a lot. I promised I'd use this weekend to clean up my office so I wont really be online much. I won't have time this weekend. Also, I'll need some help with: 1) setting up the repos to po

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Derek Atkins
Geert Janssens writes: > On 25-01-13 17:35, Derek Atkins wrote: >> Just for the record, the things left to do are: >> >> 1) get gitolite to push to github -- this will require a github reset >> 2) convert www to use git and get gitolite to signal an update instead >> of svn >> 3) send emails

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Geert Janssens
On 25-01-13 17:57, John Ralls wrote: On Jan 25, 2013, at 8:35 AM, Derek Atkins wrote: Geert Janssens writes: That's correct. Strictly speaking you could _try_ to push but the attempt would fail due to insufficient permissions. That's because the gitolite repos are configured read-only, an

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Geert Janssens
On 25-01-13 17:35, Derek Atkins wrote: Just for the record, the things left to do are: 1) get gitolite to push to github -- this will require a github reset 2) convert www to use git and get gitolite to signal an update instead of svn 3) send emails from gitolite instead of svn I think we'

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread John Ralls
On Jan 25, 2013, at 8:35 AM, Derek Atkins wrote: > Geert Janssens writes: > >> That's correct. >> >> Strictly speaking you could _try_ to push but the attempt >> would fail due to insufficient permissions. That's because the >> gitolite repos are configured read-only, and will remain so as l

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Derek Atkins
Geert Janssens writes: > That's correct. > > Strictly speaking you could _try_ to push but the attempt > would fail due to insufficient permissions. That's because the > gitolite repos are configured read-only, and will remain so as long as > the svn->gitolite bridge is in use. Yep, right now

Re: Issue running git-svn-mirror script on code

2013-01-25 Thread Geert Janssens
On 25-01-13 02:50, Yawar Amin wrote: On 2013-01-23 10:21, Derek Atkins wrote: [...] Once that happens we'll get svn -> gitolite -> github automatically on every commit (modulo the up-to-60s delay in the svn -> gitolite transfer). Then, down the road, once we turn off svn we'll still have the g

Re: Issue running git-svn-mirror script on code

2013-01-24 Thread Yawar Amin
On 2013-01-23 10:21, Derek Atkins wrote: > [...] > > The next step will be to get gitolite to push to github, but we don't > want to set that up until everyone is ready to reset github. I'm ready if everyone else is (git format-patch and am worked smoothly). If anyone's curious: $ cd $OLD_REPO_DI

Re: Issue running git-svn-mirror script on code

2013-01-24 Thread Yawar Amin
On 2013-01-23 10:21, Derek Atkins wrote: > [...] > > Once that happens we'll get svn -> gitolite -> github automatically on > every commit (modulo the up-to-60s delay in the svn -> gitolite > transfer). Then, down the road, once we turn off svn we'll still have > the gitolite -> github auto-push i

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread John Ralls
On Jan 23, 2013, at 7:39 AM, Geert Janssens wrote: > On 23-01-13 16:16, Derek Atkins wrote: >> John Ralls writes: >> >>> On Jan 23, 2013, at 3:47 AM, Geert Janssens >>> wrote: >>> I have verified the procedure to work. Thanks. I did some very minor modifications, which I hope cle

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Geert Janssens
On 23-01-13 16:15, Derek Atkins wrote: John Ralls writes: I realised this morning that the choice of (svn) URL is no longer important. The main concern to keep the original URL was to preserve the commit hashes. But due to the updates to the authors file, the svn import into git will result i

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Geert Janssens
On 23-01-13 15:37, John Ralls wrote: On Jan 23, 2013, at 2:31 AM, Geert Janssens wrote: On 22-01-13 14:30, Derek Atkins wrote: Geert Janssens writes: Another option would be to keep John's Jeeves set up to handle all git-svn interaction until we can drop our svn set up completely. The onl

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Geert Janssens
On 23-01-13 16:16, Derek Atkins wrote: John Ralls writes: On Jan 23, 2013, at 3:47 AM, Geert Janssens wrote: I have verified the procedure to work. Thanks. I did some very minor modifications, which I hope clear up some small confusions. Any suggestion to migrate the stashed stack ? Sor

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Derek Atkins
Yawar Amin writes: > Derek, svn2git is a recommended tool that uses git-svn to do the > conversion for you automatically. You just feed it an authors file > (which John has, I guess), tell it to split out the git repos from the > overarching svn repo, and let it do the work of sorting out the tag

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Derek Atkins
John Ralls writes: > On Jan 23, 2013, at 3:47 AM, Geert Janssens wrote: > >>> >> I have verified the procedure to work. Thanks. I did some very minor >> modifications, which I hope clear up some small confusions. >> >> Any suggestion to migrate the stashed stack ? >> > > Sorry, what do you m

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Derek Atkins
John Ralls writes: >> I realised this morning that the choice of (svn) URL is no longer >> important. The main concern to keep the original URL was to preserve >> the commit hashes. But due to the updates to the authors file, the >> svn import into git will result in new hashes starting with the

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread John Ralls
On Jan 23, 2013, at 3:47 AM, Geert Janssens wrote: >> > I have verified the procedure to work. Thanks. I did some very minor > modifications, which I hope clear up some small confusions. > > Any suggestion to migrate the stashed stack ? > Sorry, what do you mean by "stashed stack"? Regards

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread John Ralls
On Jan 23, 2013, at 2:31 AM, Geert Janssens wrote: > On 22-01-13 14:30, Derek Atkins wrote: >> Geert Janssens writes: >> >>> Another option would be to keep John's Jeeves set up to handle all >>> git-svn interaction until we can drop our svn set up completely. >>> >>> The only change needed o

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Geert Janssens
On 23-01-13 01:43, John Ralls wrote: On Jan 22, 2013, at 9:23 AM, John Ralls wrote: On Jan 22, 2013, at 9:00 AM, Geert Janssens wrote: On 22-01-13 17:41, John Ralls wrote: On Jan 22, 2013, at 7:04 AM, Geert Janssens wrote: What steps would your recommend to reattach private branches ? W

Re: Issue running git-svn-mirror script on code

2013-01-23 Thread Geert Janssens
On 22-01-13 14:30, Derek Atkins wrote: Geert Janssens writes: Another option would be to keep John's Jeeves set up to handle all git-svn interaction until we can drop our svn set up completely. The only change needed on John's server would be that it should push all updates to the gitolite re

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread John Ralls
On Jan 22, 2013, at 9:23 AM, John Ralls wrote: > > On Jan 22, 2013, at 9:00 AM, Geert Janssens wrote: > >> On 22-01-13 17:41, John Ralls wrote: >>> On Jan 22, 2013, at 7:04 AM, Geert Janssens >>> wrote: >>> What steps would your recommend to reattach private branches ? With my (

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Yawar Amin
Hi Geert, On 2013-01-22 12:25, Geert Janssens wrote: > [...] > > Just out of curiosity, what's the size of your private history to > convert ? The only significant work I have is my fork on GitHub (yawaramin/gnucash-docs). Other than that, a few throwaway learning experiments > Regarding svn,

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
On 22-01-13 16:16, Yawar Amin wrote: Hi folks, On 2013-01-22, at 9:51, John Ralls wrote: On Jan 22, 2013, at 5:30 AM, Derek Atkins wrote: [...] Maybe.. Here's the bigger issue, if I found issues/bugs in John's svn->git conversion, what do we do? (and yes, I found a problem in the conver

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread John Ralls
On Jan 22, 2013, at 9:00 AM, Geert Janssens wrote: > On 22-01-13 17:41, John Ralls wrote: >> On Jan 22, 2013, at 7:04 AM, Geert Janssens >> wrote: >> >>> What steps would your recommend to reattach private branches ? With my >>> (limited) git knowledge I would only know how to export (git fo

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Derek Atkins
Geert Janssens writes: > On 22-01-13 17:41, John Ralls wrote: > >> Can we have the gitolite repo available for a few days to test out >> procedures like this before we recreate the Github repo so that we >> can have good instructions on the wiki page? > > Sure, it's easy to set up read-only acces

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
On 22-01-13 17:41, John Ralls wrote: On Jan 22, 2013, at 7:04 AM, Geert Janssens wrote: What steps would your recommend to reattach private branches ? With my (limited) git knowledge I would only know how to export (git format-patch) from the old repo and import (git am) in the new clone. Is

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread John Ralls
On Jan 22, 2013, at 7:04 AM, Geert Janssens wrote: > What steps would your recommend to reattach private branches ? With my > (limited) git knowledge I would only know how to export (git format-patch) > from the old repo and import (git am) in the new clone. Is there a more > direct way to do

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Derek Atkins
Yawar Amin writes: > Personally, I feel that it's important to have the history "correct", > > even if it means resetting and invalidating the existing repos. > > [...] > > Yes, this is a good opportunity to fix the history. We can simply delete > and regenerat

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Derek Atkins
Mike Evans writes: > Since I was expecting to have to do a fresh clone from gitolite anyway > and since my repo is from git-svn, my commit hashes don't match GitHub > anyway. I'd say make it right and I (we?) can re-clone from the the new > gitolite repo once the transfer is complete. I think th

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread John Ralls
On Jan 22, 2013, at 7:01 AM, Geert Janssens wrote: > That's ugly... > > Chris Shoemaker is the name associated with svn name "chris", so the issue is > indeed in the github repo. > > I agree to restart from scratch on github. I also prefer correctness of > authorship. > > I have a couple of

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Yawar Amin
Hi Geert, On 2013-01-22, at 10:04, Geert Janssens wrote: > [...] > What steps would your recommend to reattach private branches ? With my > (limited) git knowledge I would only know how to export (git format-patch) > from the old repo and import (git am) in the new clone. Is there a more > di

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Yawar Amin
Hi folks, On 2013-01-22, at 9:51, John Ralls wrote: > On Jan 22, 2013, at 5:30 AM, Derek Atkins wrote: > >>> [...] >> >> Maybe.. Here's the bigger issue, if I found issues/bugs in John's >> svn->git conversion, what do we do? (and yes, I found a problem in the >> conversion) >> >> [...] >>

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
On 22-01-13 15:51, John Ralls wrote: On Jan 22, 2013, at 5:30 AM, Derek Atkins wrote: Geert Janssens writes: Another option would be to keep John's Jeeves set up to handle all git-svn interaction until we can drop our svn set up completely. The only change needed on John's server would be

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
That's ugly... Chris Shoemaker is the name associated with svn name "chris", so the issue is indeed in the github repo. I agree to restart from scratch on github. I also prefer correctness of authorship. I have a couple of local branches with commits not on github, but that doesn't matter.

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread John Ralls
On Jan 22, 2013, at 5:30 AM, Derek Atkins wrote: > Geert Janssens writes: > >> Another option would be to keep John's Jeeves set up to handle all >> git-svn interaction until we can drop our svn set up completely. >> >> The only change needed on John's server would be that it should push >> a

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Mike Evans
On Tue, 22 Jan 2013 08:30:38 -0500 Derek Atkins wrote: > Geert Janssens writes: > > > Another option would be to keep John's Jeeves set up to handle all > > git-svn interaction until we can drop our svn set up completely. > > > > The only change needed on John's server would be that it should p

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
On 22-01-13 14:20, Derek Atkins wrote: Yawar Amin writes: Hi Derek, On 2013-01-21, at 9:11, Derek Atkins wrote: Hey all, Geert and I were working over the weekend to try to set up an svn->git mirror on code. Alas, I seem to have an issue that I don't know how to fix. I don't know gitoli

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Derek Atkins
Geert Janssens writes: > Another option would be to keep John's Jeeves set up to handle all > git-svn interaction until we can drop our svn set up completely. > > The only change needed on John's server would be that it should push > all updates to the gitolite repositories instead of the github

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Derek Atkins
Yawar Amin writes: > Hi Derek, > > On 2013-01-21, at 9:11, Derek Atkins wrote: > >> Hey all, >> >> Geert and I were working over the weekend to try to set up an svn->git >> mirror on code. Alas, I seem to have an issue that I don't know how to >> fix. > > I don't know gitolite, but wouldn't it

Re: Issue running git-svn-mirror script on code

2013-01-22 Thread Geert Janssens
On 21-01-13 21:03, Yawar Amin wrote: Hi Derek, On 2013-01-21, at 9:11, Derek Atkins wrote: Hey all, Geert and I were working over the weekend to try to set up an svn->git mirror on code. Alas, I seem to have an issue that I don't know how to fix. I don't know gitolite, but wouldn't it work

Re: Issue running git-svn-mirror script on code

2013-01-21 Thread Yawar Amin
Hi Derek, On 2013-01-21, at 9:11, Derek Atkins wrote: > Hey all, > > Geert and I were working over the weekend to try to set up an svn->git > mirror on code. Alas, I seem to have an issue that I don't know how to > fix. I don't know gitolite, but wouldn't it work if you simply copied (not cl

Re: Issue running git-svn-mirror script on code

2013-01-21 Thread John Ralls
On Jan 21, 2013, at 8:33 AM, Derek Atkins wrote: > John Ralls writes: > >>> I did: >>> >>> git clone >>> git svn init --stdlayout file:///repo/gnucash-docs >>> git-update >>> git-svn-mirror update . >> >> Yes, the [svn2git] and [svn] sections are normally set up by >> git-svn-mirror when st

Re: Issue running git-svn-mirror script on code

2013-01-21 Thread Derek Atkins
John Ralls writes: >> I did: >> >> git clone >> git svn init --stdlayout file:///repo/gnucash-docs >> git-update >> git-svn-mirror update . > > Yes, the [svn2git] and [svn] sections are normally set up by > git-svn-mirror when starting from scratch. So am I not supposed to add those manual

Re: Issue running git-svn-mirror script on code

2013-01-21 Thread John Ralls
On Jan 21, 2013, at 6:11 AM, Derek Atkins wrote: > Hey all, > > Geert and I were working over the weekend to try to set up an svn->git > mirror on code. Alas, I seem to have an issue that I don't know how to > fix. > > I did: > > git clone > git svn init --stdlayout file:///repo/gnucash-d

Issue running git-svn-mirror script on code

2013-01-21 Thread Derek Atkins
Hey all, Geert and I were working over the weekend to try to set up an svn->git mirror on code. Alas, I seem to have an issue that I don't know how to fix. I did: git clone git svn init --stdlayout file:///repo/gnucash-docs git-update git-svn-mirror update . After doing a bunch of stu