8 Oct
2009
8 Oct
'09
5:11 p.m.
8 okt 2009 kl. 16.03 skrev Jan Janak:
On Thu, Oct 8, 2009 at 3:29 PM, Olle E. Johansson
<oej(a)edvina.net>
wrote:
Well, if you want to revert then it is YOUR problem... Ha ha.
8 okt 2009 kl. 15.17 skrev Jan Janak:
Reverting commits is unfortunately not easily doable, so better be
careful :-). On Thu, Oct 8, 2009 at 3:12 PM, Olle E. Johansson
<oej(a)edvina.net>
wrote:
Thanks for all you patience! It seems to work now.
Be prepared to revert stupid commits ;-)
8 okt 2009 kl. 14.58 skrev Jan Janak:
> On Thu, Oct 8, 2009 at 2:45 PM, Olle E. Johansson <oej(a)edvina.net>
> wrote:
>>
>> 8 okt 2009 kl. 14.36 skrev Klaus Darilion:
>>
>>>
>>>
>>> Olle E. Johansson schrieb:
>>>>
>>>> 8 okt 2009 kl. 13.37 skrev Klaus Darilion:
>>>>>
>>>>> Hi Olle!
>>>>>
>>>>> Why do you edit the Kamailio trunk on sourceforge?
>>>>> sourceforge repository is only used for patching older
>>>>> releases
>>>>> (1.3,1.4
>>>>> and 1.5 branches).
>>>>>
>>>>> trunk is not used anymore, trunk-development happens on sip-
>>>>> router
>>>>> git
>>>>> repository.
>>>>>
>>>> Just to test that I had access... :-)
>>>> Now trying to get git access up and running too.
>>>
>>> Have fun! ;-)
>>
>> Already have... Had some changes to Makefile (to include ldap
>> module)
>> and
>> did not want to commit that. Ended up removing it and now git
>> says it's
>> deleted... How on earth do I properly revert a change?
>
> git checkout <file>
>
Great. The mystery continues:
1x-193-157-197-57:sip-router.2 olle$ git push
To ssh://oej@git.sip-router.org/sip-router
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to
'ssh://oej@git.sip-router.org/sip-router'
This error means that your local repository is not up-to-date, in
other words you have modified an older version and git wants you to
pull the latest changes, resolve conflicts (if any) and then push
again.
Run git pull and then try again.
If you have bigger changes or if you are unsure then it is better to
put them on a separate branch and then push that branch into the
shared repository where we can review it and then merge it into the
master branch.
That's what we do in <the-other-project>. I am well known
to have too
many branches...
If you have your changes on a branch called "my_branch" then you can
push it into the shared repository with:
git push origin my_branch:oej/my_branch
"oej/my_branch" is the desired name of the newly created branch in the
shared repository at git.sip-router.org. Note that it should start
with your username followed by slash (oej/), because the shared
repository is configured to accept private branches only if they start
with the committer's username.
Great. Thanks.
To start with, you'll propably see a series of minor fixes to docs and
stuff like that.
/O