Hey max,
thanks for helping out. From the error message it looks to me that your
worked on the wrong branch. The mob branch is the one to work on. If you
follows the steps in [1] you should normally be on that branch after:
git checkout -b mob origin/mob
to test if you're there type:
git branch
the branch you're on it highlighted with and asterisk (*).
if you're still in master you can change the branches by typing:
git checkout mob
Then you should do a
git pull
to have the very latest patches in your working tree. after that you can
apply your patch. To commit your changes the safest way is to go to the
root source directory and type:
git commit -a
then your favorite editor (of cause vi ;)) should open and you can enter
a commit message. after saving the commit is generated. Then you should
be able to
git push
If you did you changes to the mob branch no error should occure.
I hoped that helped
Boris "transacid" Petersen
On 31.10.2008 04:54, _mx_ wrote:
> Hello,
>
> I fixed the bug reported in Bugzilla as "Bug 105 cursor jumps when
> typing multiline messages"
>
> I'm new with git (I use svn), I followed the tutorial [1], but I have an
> error when I try to send to server these corrections that I made (git
> push). This is the error that I got:
> ---------------------------------
> [~/centerim]$ git push
> updating 'refs/heads/master'
> from 24932da60ad359e5363d306345cff01de86f76f3
> to 3cfa572224b716ac05f6cc4951b97467c09944a2
> Generating pack...
> Done counting 9 objects.
> Result has 5 objects.
> Deltifying 5 objects.
> 100% (5/5) done
> Writing 5 objects.
> 100% (5/5) done
> Total 5, written 5 (delta 4), reused 0 (delta 0)
> The mob user can push only to the 'mob' branch, sorry
> error: hooks/update exited with error code 1
> error: hook declined to update refs/heads/master
> ng refs/heads/master hook declined
> ---------------------------------
>
>
>
> Here is my "commit description":
> This commit fix the bug reported in Bugzilla as "Bug 105 cursor jumps
> when typing multiline messages".
> The problem happen when the texteditor try to merge a line 'cause some
> caracter are excluded in one line (diferent of the last line) of a
> multiline message .
>
>
>
>
> There is only one file changed (kkconsui/src/texteditor.cc), here is the
> diff:
> --------------------------------
> @@ -40,6 +40,7 @@
> * 10.07.2000 undo() implemented
> * 25.07.2000 tab support improved
> * 06.09.2000 blocks handling improved, shiftmarkedblock method added
> +* 31.10.2008 mergeline() minor bug fixed
> *
> */
>
> @@ -2224,20 +2225,24 @@
> anext[able] = 0;
>
> if(asub = strpbrk(anext, WORD_DELIM)) {
> + int pxdeltamerge;
> for(; atsub = strpbrk(asub+1, WORD_DELIM); asub = atsub);
> char *newline = new char[strlen(p)+asub-anext+2];
> strcpy(newline, p);
> if ((ln==(py-1)) && (px<(asub-anext+1))) { // move to
> previous line
> px += strlen(newline);
> + pxdeltamerge = px; //accepting that change px even
> if the line is merged
> py--;
> }
> else {
> - px -= (asub-anext+1); // move back
> + //px -= (asub-anext+1); // move back
> + pxdeltamerge = px - (asub-anext+1); //px can't be
> changed even if the line is merged
> }
> strncat(newline, next, asub-anext+1);
> strcut(next, 0, asub-anext+1);
> curfile->lines->replace(ln, newline);
> - mergeline(ln+1, false, px, py); // we've merged
> something from the next line - try to merge it too
> + //mergeline(ln+1, false, px, py); // we've merged
> something from the next line - try to merge it too
> + mergeline(ln+1, false, pxdeltamerge, py); // we've
> merged something from the next line - try to merge it too
> }
>
> free(anext);
> --------------------------------
>
>
>
> Someone can help me with the git, or add the corrections, please?
>
> thanks
>
> Max
>
> [1] http://www.centerim.org/index.php/Contribute_Code
>
--
_______________________________________________
Centerim-devel mailing list
Centerim-devel@centerim.org
http://centerim.org/mailman/listinfo/centerim-devel
http://www.centerim.org/
