[Ohrrpgce] SVN: james/12294 Jenkinsfile: Trigger builds by polling for changes every 5 minutes

Sun Aug 1 18:32:13 PDT 2021

I'm not sure quite how that happened but I've seen a similar problem when
pushing to a repo with both a cron job and manually.
I see that svn/web (which is pushed to bitbucket but not to the github
'ohrrpgce' repo) and web/web (https://github.com/ohrrpgce/web/tree/web) had
different git commits for the same svn commit.
And I've just discovered I was running a slightly old version of the
git-svn-sh script! That explains the flood of commits.

I can fix it by fetching the svn/web one and force-pushing it to web/web.
In future, you can fix such an issue by manually doing a force-push from
your local repo (you'd have to copy and modify the correct line from the
script). Or we could just add -f flags to the cron script. I suppose
there's no danger in that as long as svn is the

On Mon, 2 Aug 2021 at 13:13, James Paige <Bob at hamsterrepublic.com> wrote:

> I have the cron job set up now, and it mostly works.
> Only the svn/web stuff seems to have a problem
>
>
> Everything up-to-date
> Everything up-to-date
> Everything up-to-date
> To git at github.com:ohrrpgce/web.git
>  ! [rejected]        svn/web -> web (fetch first)
> error: failed to push some refs to 'git at github.com:ohrrpgce/web.git'
> hint: Updates were rejected because the remote contains work that you do
> hint: not have locally. This is usually caused by another repository
> pushing
> hint: to the same ref. You may want to first integrate the remote changes
> hint: (e.g., 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
> On Sun, Aug 1, 2021 at 9:08 PM Ralph Versteegen <teeemcee at gmail.com>
> wrote:
>
>> Then you might now have two Bitbucket accounts :)
>>
>> OK, seems to be working, and there was a resulting flood of commits to
>> the bitbucket one, so apparently my cronjob wasn't actually working! I've
>> turned it off now.
>>
>> I had forgotten that I already have a cronjob for updating and uploading
>> the sorted bug/feature votes. It runs cronjob.sh in
>> https://github.com/ohrrpgce/OHR-Git-Issues and it's uploaded to
>> http://tmc.castleparadox.com/ohr/issue_votes.html
>> I think I just never got around to actually linking to that page from
>> anywhere!
>> Although we could upload it to HR.com somewhere instead. CP uptime seems
>> to be less and less.
>>
>> On Mon, 2 Aug 2021 at 01:59, James Paige <Bob at hamsterrepublic.com> wrote:
>>
>>> I got both and accepted both :D
>>>
>>> I'll try the Cron job later today
>>>
>>>
>>> On Sat., Jul. 31, 2021, 11:43 p.m. Ralph Versteegen, <teeemcee at gmail.com>
>>> wrote:
>>>
>>>> Actually, the repository is https://bitbucket.org/rbv/ohrrpgce-svn.
>>>> The 'ohrrpgce' one is my own personal repo.
>>>> I sent you an invite. In Bitbucket you need to invite users by email
>>>> address, not account name (I think it's an anti-spam measure). I wasn't
>>>> sure which email address you used so I invited both that one and your gmail
>>>> one.
>>>>
>>>> On Sun, 1 Aug 2021 at 12:35, James Paige <Bob at hamsterrepublic.com>
>>>> wrote:
>>>>
>>>>> I went ahead and created a bitbucket account so I can run the cron
>>>>> script. My username is bob_the_hamster
>>>>>
>>>>> Do you need anything else from me to be able to give me access to
>>>>> https://bitbucket.org/rbv/ohrrpgce/ ?
>>>>>
>>>>> On Sat, Jul 31, 2021 at 6:12 AM Ralph Versteegen <teeemcee at gmail.com>
>>>>> wrote:
>>>>>
>>>>>> The cron job also pushes to the bitbucket mirror. Apparently you
>>>>>> would need a bitbucket account (rather than giving me a public ssh key) to
>>>>>> push to it. Or I could change my cron job to only mirror to BB. Or maybe
>>>>>> it's time to retire it.
>>>>>>
>>>>>> On Sat, 31 Jul 2021 at 14:57, James Paige <Bob at hamsterrepublic.com>
>>>>>> wrote:
>>>>>>
>>>>>>> Sure, good idea. I should have time to set it up this weekend.
>>>>>>>
>>>>>>> And I'm okay with never editing commit messages. Typos add character
>>>>>>> 😄
>>>>>>>
>>>>>>> On Fri., Jul. 30, 2021, 10:11 p.m. Ralph Versteegen, <
>>>>>>> teeemcee at gmail.com> wrote:
>>>>>>>
>>>>>>>> Also, if both of us run cron jobs to update it there should be no
>>>>>>>> problem, unless someone edits an svn commit, which can cause the git
>>>>>>>> commits to go out of sync.
>>>>>>>> If you set up a cron job then I'll stop mine.
>>>>>>>>
>>>>>>>> On Sat, 31 Jul 2021 at 14:09, Ralph Versteegen <teeemcee at gmail.com>
>>>>>>>> wrote:
>>>>>>>>
>>>>>>>>> I have a cron job to update it every 20 minutes, but it runs on my
>>>>>>>>> desktop, which is not on all day.
>>>>>>>>> I did suggest that you run the cron job instead on a more suitable
>>>>>>>>> machine; I think I put instructions in a previous email.
>>>>>>>>> It would be nice to also add a cron job to update the ranked list
>>>>>>>>> of bugs and feature requests, and upload that to the website somewhere.
>>>>>>>>>
>>>>>>>>> On Fri, 30 Jul 2021 at 06:55, James Paige <Bob at hamsterrepublic.com>
>>>>>>>>> wrote:
>>>>>>>>>
>>>>>>>>>> 5 minutes is a bit fast, I'm just playing around with this.
>>>>>>>>>>
>>>>>>>>>> I actually don't know how often
>>>>>>>>>> https://github.com/ohrrpgce/ohrrpgce updates from the svn
>>>>>>>>>> upstream
>>>>>>>>>>
>>>>>>>>>> On Thu, Jul 29, 2021 at 2:41 PM <subversion at hamsterrepublic.com>
>>>>>>>>>> wrote:
>>>>>>>>>>
>>>>>>>>>>> james
>>>>>>>>>>> 2021-07-29 11:41:51 -0700 (Thu, 29 Jul 2021)
>>>>>>>>>>> 133
>>>>>>>>>>> Jenkinsfile: Trigger builds by polling for changes every 5
>>>>>>>>>>> minutes
>>>>>>>>>>> But also wait 60 seconds first in case more commits are on the
>>>>>>>>>>> way
>>>>>>>>>>> ---
>>>>>>>>>>> U   wip/Jenkinsfile
>>>>>>>>>>>
>>>>>>>>>>> _______________________________________________
>>>>>>>>>>> Ohrrpgce mailing list
>>>>>>>>>>> ohrrpgce at lists.motherhamster.org
>>>>>>>>>>>
>>>>>>>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>>>>>>>
>>>>>>>>>> _______________________________________________
>>>>>>>>>> Ohrrpgce mailing list
>>>>>>>>>> ohrrpgce at lists.motherhamster.org
>>>>>>>>>>
>>>>>>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>>>>>>
>>>>>>>>> _______________________________________________
>>>>>>>> Ohrrpgce mailing list
>>>>>>>> ohrrpgce at lists.motherhamster.org
>>>>>>>>
>>>>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>>>>
>>>>>>> _______________________________________________
>>>>>>> Ohrrpgce mailing list
>>>>>>> ohrrpgce at lists.motherhamster.org
>>>>>>>
>>>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>>>
>>>>>> _______________________________________________
>>>>>> Ohrrpgce mailing list
>>>>>> ohrrpgce at lists.motherhamster.org
>>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>>
>>>>> _______________________________________________
>>>>> Ohrrpgce mailing list
>>>>> ohrrpgce at lists.motherhamster.org
>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>
>>>> _______________________________________________
>>>> Ohrrpgce mailing list
>>>> ohrrpgce at lists.motherhamster.org
>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>
>>> _______________________________________________
>>> Ohrrpgce mailing list
>>> ohrrpgce at lists.motherhamster.org
>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>
>> _______________________________________________
>> Ohrrpgce mailing list
>> ohrrpgce at lists.motherhamster.org
>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>
> _______________________________________________
> Ohrrpgce mailing list
> ohrrpgce at lists.motherhamster.org
> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.motherhamster.org/pipermail/ohrrpgce-motherhamster.org/attachments/20210802/96a383fe/attachment-0001.html>