Quantcast

svn - git sync stopped working ?

classic Classic list List threaded Threaded
15 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

svn - git sync stopped working ?

Geert Janssens
The last commit in svn is r22278, committed by me two days ago. On
github however, the most recent commit is 22277, committed by me just
before.

Because of this I can't push my most recent patches via git svn dcommit.

Can anybody with the proper access to the sync infrastructure check
what's going on ?

Thanks,

Geert
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Derek Atkins
Geert,

Geert Janssens <[hidden email]> writes:

> The last commit in svn is r22278, committed by me two days ago. On
> github however, the most recent commit is 22277, committed by me just
> before.
>
> Because of this I can't push my most recent patches via git svn dcommit.
>
> Can anybody with the proper access to the sync infrastructure check
> what's going on ?

I believe John Ralls runs that...  Hopefully he'll take a look.

> Thanks,
>
> Geert

-derek

--
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       [hidden email]                        PGP key available
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

John Ralls-2

On Aug 3, 2012, at 8:18 AM, Derek Atkins <[hidden email]> wrote:

> Geert,
>
> Geert Janssens <[hidden email]> writes:
>
>> The last commit in svn is r22278, committed by me two days ago. On
>> github however, the most recent commit is 22277, committed by me just
>> before.
>>
>> Because of this I can't push my most recent patches via git svn dcommit.
>>
>> Can anybody with the proper access to the sync infrastructure check
>> what's going on ?
>
> I believe John Ralls runs that...  Hopefully he'll take a look.
>

He's looking ;-)

I ran the update manually a few minutes ago, so your change from yesterday is in Github.

The automatic updates have been having trouble since July 16th, with the following errors:
Jul 29 00:31:04 jeeves Gnucash_knocker[5621]: Processing Directory gnucash-trunk
Jul 29 00:31:05 jeeves Gnucash_knocker[5621]: Running git svn fetch
Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: Index mismatch: 7de472389078c145c59c9bc8615abd0651064b3e != c8c076d25038188cd45688b6cf7c6b72a8739c35
Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: rereading b78ad314c18ea1b20e065a9896fee881009c106d
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: usage: git-hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: hash-object -w --stdin-paths --no-filters: command returned error: 129
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]:
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad file descriptor at /usr/bin/git-svn line 0
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad file descriptor at /usr/bin/git-svn line 0
Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: svn fetch: command returned error: 1

Why it works manually and fails when launched by "knocker" is so far a mystery.

Regards,
John Ralls

_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Backport policy; was: svn - git sync stopped working ?

Frank H. Ellenberger-3
In reply to this post by Geert Janssens
Hoi Geert,

Am 03.08.2012 16:29, schrieb Geert Janssens:
> The last commit in svn is r22278, committed by me two days ago. On
> github however, the most recent commit is 22277, committed by me just
> before.
:

I was just wondering if some of your and Alex' patches should be
backported. Or are we shure 2.4.11 was the last before 2.6?

Frank
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Backport policy; was: svn - git sync stopped working ?

Geert Janssens
On 03-08-12 23:46, Frank H. Ellenberger wrote:

> Hoi Geert,
>
> Am 03.08.2012 16:29, schrieb Geert Janssens:
>> The last commit in svn is r22278, committed by me two days ago. On
>> github however, the most recent commit is 22277, committed by me just
>> before.
> :
>
> I was just wondering if some of your and Alex' patches should be
> backported. Or are we shure 2.4.11 was the last before 2.6?
>
> Frank
Hi Frank,

Which commits do you think should get backported ?

My general rule of thumb for backporting is: if the patch fixes a bug
reported by a user in the stable release, then backport it, otherwise
it's for the next major release.

I don't know if we will do another 2.4.x release. It depends on when we
plan for 2.6. Until now, nothing has been formally decided yet.

Geert
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Geert Janssens
In reply to this post by John Ralls-2
On 03-08-12 17:36, John Ralls wrote:

> He's looking ;-)
>
> I ran the update manually a few minutes ago, so your change from
> yesterday is in Github.
>
> The automatic updates have been having trouble since July 16th, with
> the following errors:
> Jul 29 00:31:04 jeeves Gnucash_knocker[5621]: Processing Directory
> gnucash-trunk
> Jul 29 00:31:05 jeeves Gnucash_knocker[5621]: Running git svn fetch
> Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: Index mismatch:
> 7de472389078c145c59c9bc8615abd0651064b3e !=
> c8c076d25038188cd45688b6cf7c6b72a8739c35
> Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: rereading
> b78ad314c18ea1b20e065a9896fee881009c106d
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: usage: git-hash-object [
> [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: hash-object -w
> --stdin-paths --no-filters: command returned error: 129
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]:
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad
> file descriptor at /usr/bin/git-svn line 0
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad
> file descriptor at /usr/bin/git-svn line 0
> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: svn fetch: command
> returned error: 1
>
> Why it works manually and fails when launched by "knocker" is so far a
> mystery.
>
> Regards,
> John Ralls
>
No idea either... The error seems to happen because git thinks you are
calling the command with improper arguments (that's what error code 129
means). Perhaps a subtle quoting issue in one of the scripts that only
shows when running the update automatically ?

Geert

_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Geert Janssens
On 05-08-12 16:49, Geert Janssens wrote:

> On 03-08-12 17:36, John Ralls wrote:
>> He's looking ;-)
>>
>> I ran the update manually a few minutes ago, so your change from
>> yesterday is in Github.
>>
>> The automatic updates have been having trouble since July 16th, with
>> the following errors:
>> Jul 29 00:31:04 jeeves Gnucash_knocker[5621]: Processing Directory
>> gnucash-trunk
>> Jul 29 00:31:05 jeeves Gnucash_knocker[5621]: Running git svn fetch
>> Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: Index mismatch:
>> 7de472389078c145c59c9bc8615abd0651064b3e !=
>> c8c076d25038188cd45688b6cf7c6b72a8739c35
>> Jul 29 00:31:14 jeeves Gnucash_knocker[5621]: rereading
>> b78ad314c18ea1b20e065a9896fee881009c106d
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: usage: git-hash-object
>> [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths <
>> <list-of-paths> ]
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: hash-object -w
>> --stdin-paths --no-filters: command returned error: 129
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]:
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad
>> file descriptor at /usr/bin/git-svn line 0
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: error closing pipe: Bad
>> file descriptor at /usr/bin/git-svn line 0
>> Jul 29 00:31:15 jeeves Gnucash_knocker[5621]: svn fetch: command
>> returned error: 1
>>
>> Why it works manually and fails when launched by "knocker" is so far
>> a mystery.
>>
>> Regards,
>> John Ralls
>>
> No idea either... The error seems to happen because git thinks you are
> calling the command with improper arguments (that's what error code
> 129 means). Perhaps a subtle quoting issue in one of the scripts that
> only shows when running the update automatically ?
>
> Geert
>
At least I'm giving you plenty of opportunity to test ;) I've got
another set of patches waiting for the sync to happen before I can svn
dcommit them.

I hope you can sort this out soon. If there's anything I can do to help,
just let me know.

Geert

_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

John Ralls-2

On Aug 7, 2012, at 7:53 AM, Geert Janssens wrote:
> At least I'm giving you plenty of opportunity to test ;) I've got another set of patches waiting for the sync to happen before I can svn dcommit them.
>
> I hope you can sort this out soon. If there's anything I can do to help, just let me know.

I just ran it manually, so you should be able to git-update now.

I can actually test locally using nc. The problem appears to be a subtle difference (not uid or gid) between the environment created by xinetd and my regular shell. If the script is launched by xinetd it fails, but if I run it from a regular shell it works.

BTW, your mailer is sending everything twice from different upstream accounts. The ids from your last message:
        Message-Id: <[hidden email]>
        Message-Id: <[hidden email]>

Regards,
John Ralls


_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Derek Atkins-3
Have the script do "printenv > /tmp/script.env.$$" and then compare the
environments?

-derek

On Tue, August 7, 2012 11:57 am, John Ralls wrote:

>
> On Aug 7, 2012, at 7:53 AM, Geert Janssens wrote:
>> At least I'm giving you plenty of opportunity to test ;) I've got
>> another set of patches waiting for the sync to happen before I can svn
>> dcommit them.
>>
>> I hope you can sort this out soon. If there's anything I can do to help,
>> just let me know.
>
> I just ran it manually, so you should be able to git-update now.
>
> I can actually test locally using nc. The problem appears to be a subtle
> difference (not uid or gid) between the environment created by xinetd and
> my regular shell. If the script is launched by xinetd it fails, but if I
> run it from a regular shell it works.
>
> BTW, your mailer is sending everything twice from different upstream
> accounts. The ids from your last message:
> Message-Id: <[hidden email]>
> Message-Id: <[hidden email]>
>
> Regards,
> John Ralls
>
>


--
       Derek Atkins                 617-623-3745
       [hidden email]             www.ihtfp.com
       Computer and Internet Security Consultant

_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

John Ralls-2

On 07/08/2012, at 9:28 AM, Derek Atkins wrote:

> Have the script do "printenv > /tmp/script.env.$$" and then compare the
> environments?
>
> -derek
>
> On Tue, August 7, 2012 11:57 am, John Ralls wrote:
>>
>> On Aug 7, 2012, at 7:53 AM, Geert Janssens wrote:
>>> At least I'm giving you plenty of opportunity to test ;) I've got
>>> another set of patches waiting for the sync to happen before I can svn
>>> dcommit them.
>>>
>>> I hope you can sort this out soon. If there's anything I can do to help,
>>> just let me know.
>>
>> I just ran it manually, so you should be able to git-update now.
>>
>> I can actually test locally using nc. The problem appears to be a subtle
>> difference (not uid or gid) between the environment created by xinetd and
>> my regular shell. If the script is launched by xinetd it fails, but if I
>> run it from a regular shell it works.

Wasn't all that subtle after all, it was $PATH. For reasons known only to the gods, between 20:31 July 15th (the last successful run) and 00:31 on the 16th (the first failure), xinetd decided to stop loading the PATH set in my environment when executing the script and so got the distro-installed version of git. I've added an explicit PATH setting to the script and now it works from nc again.

Regards,
John Ralls
 


_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Geert Janssens
In reply to this post by John Ralls-2
On 07-08-12 17:57, John Ralls wrote:

> On Aug 7, 2012, at 7:53 AM, Geert Janssens wrote:
>> At least I'm giving you plenty of opportunity to test ;) I've got another set of patches waiting for the sync to happen before I can svn dcommit them.
>>
>> I hope you can sort this out soon. If there's anything I can do to help, just let me know.
> I just ran it manually, so you should be able to git-update now.
>
> I can actually test locally using nc. The problem appears to be a subtle difference (not uid or gid) between the environment created by xinetd and my regular shell. If the script is launched by xinetd it fails, but if I run it from a regular shell it works.
>
> BTW, your mailer is sending everything twice from different upstream accounts. The ids from your last message:
> Message-Id: <[hidden email]>
> Message-Id: <[hidden email]>
Nah, I'm sending things twice... I regularly send a mail from the wrong
account first. Usually I notice this, cancel the post held in moderation
and send again. But this time, someone cleared the moderation queue
before I could fix my mistake...

Geert

_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

John Ralls-2

On 07/08/2012, at 10:29 AM, Geert Janssens wrote:

> On 07-08-12 17:57, John Ralls wrote:
>> BTW, your mailer is sending everything twice from different upstream accounts. The ids from your last message:
>> Message-Id: <[hidden email]>
>> Message-Id: <[hidden email]>
> Nah, I'm sending things twice... I regularly send a mail from the wrong account first. Usually I notice this, cancel the post held in moderation and send again. But this time, someone cleared the moderation queue before I could fix my mistake...

Hah, I do the same from time-to-time... but I cancel first then send, and I remove all recipients except the list from the resend so they don't get two directly in their inboxes.

Regards,
John Ralls


_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: svn - git sync stopped working ?

Derek Atkins
In reply to this post by John Ralls-2
John Ralls <[hidden email]> writes:

> Wasn't all that subtle after all, it was $PATH. For reasons known only
> to the gods, between 20:31 July 15th (the last successful run) and
> 00:31 on the 16th (the first failure), xinetd decided to stop loading
> the PATH set in my environment when executing the script and so got
> the distro-installed version of git. I've added an explicit PATH
> setting to the script and now it works from nc again.

Maybe xinted got restarted from a different environment so $PATH was
different?

> Regards,
> John Ralls

-derek

--
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       [hidden email]                        PGP key available
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Backport policy; was: svn - git sync stopped working ?

Frank H. Ellenberger-3
In reply to this post by Geert Janssens
Am 05.08.2012 15:46, schrieb Geert Janssens:
> Hi Frank,
>
> Which commits do you think should get backported ?
:

After a long busy time I remembered my passphrase. ;-)
When I watched configure.ac, I saw warlord backporting his change, while
your Changeset 22277 is only in trunk.

So I was unsure for my change, but in between I backported it and John
improved it.

> My general rule of thumb for backporting is: if the patch fixes a bug
> reported by a user in the stable release, then backport it, otherwise
> it's for the next major release.

Sounds OK to me.

> I don't know if we will do another 2.4.x release. It depends on when we
> plan for 2.6. Until now, nothing has been formally decided yet.

The wiki section in Release Schedule is a good idea.

> Geert

Frank
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: Backport policy; was: svn - git sync stopped working ?

Geert Janssens
On 10-08-12 09:49, Frank H. Ellenberger wrote:
> Am 05.08.2012 15:46, schrieb Geert Janssens:
>> Hi Frank,
>>
>> Which commits do you think should get backported ?
> :
>
> After a long busy time I remembered my passphrase. ;-)
> When I watched configure.ac, I saw warlord backporting his change, while
> your Changeset 22277 is only in trunk.
This was a follow up on Bob's work to remove depreciated gtk and glib
functions from our code. This is only done on trunk (as it requires more
recent gtk and glib versions than we require on 2.4). As it's part of a
larger effort, I didn't want to backport that single change.
> So I was unsure for my change, but in between I backported it and John
> improved it.
Ok
>
>> I don't know if we will do another 2.4.x release. It depends on when we
>> plan for 2.6. Until now, nothing has been formally decided yet.
> The wiki section in Release Schedule is a good idea.
>
>
I did some small updates on that page a few days ago, but the release
schedule for 2.5 is obviously outdated.

Geert
_______________________________________________
gnucash-devel mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Loading...