trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: March 2012

Re: [trinity-devel] New tdewebdev GIT source Fails to build - crashes at 100% (tqt_enter_modal/tqt_leave_modal)

From: "Timothy Pearson" <kb9vqf@...>
Date: Fri, 9 Mar 2012 14:18:41 -0600
>> > Okay, so a significant issue is the server response.
>> Nonetheless, what is
>> > the/your preferred way to push patches? Is this
>> correct?
>> >
>> > cd [module]
>> > git pull
>> > [merge patches to module]
>> > git commit -a
>> > git push
>> >
>>
>> Yes, or this also works:
>> cd [module]
>> [merge patches to module]
>> git pull
>> git commit -a
>> git push
>
> Okay, so perform a git pull before the git commit.
>
>> The main problem that seems to have been caused by your last
>> commits was silent rejection of a few of my commits at the push
>> stage.  This problem was difficult to hunt down due to GIT's rather
>> opaque error
>> messages.
>
> Is everything going to be okay? All of my patches last night were
> resolving branding issues.

Yes, everything should actually be OK now.  First time I've had this
happen and I am updating the commit_all_submodules script so that it
doesn't happen again. :-)

>> Moral of the story: GIT can be a royal pain at times. :-)
>
> I already knew that. Designed by a geek for geeks. Screw everybody else.
> :)

Heh.  Some plain-English error messages with suggested actions would make
all the difference.  Making submodules more robust would be nice too. :-)

Tim