Hey Boris,
now the "commit" was done.
Thanks for your hints.
may be the tutorial have to be updated, I think the needed steps are not
completely described. In attached file have the steps that I made and their
output messages (you will see the Emacs ;)). Special attention to: "git
checkout mob" and "git-update-index"
Max
On Fri, Oct 31, 2008 at 3:47 AM, Boris Petersen <[EMAIL PROTECTED]>wrote:
> 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
> [email protected]
> http://centerim.org/mailman/listinfo/centerim-devel
> http://www.centerim.org/
>
[~/c]$ git clone git+ssh://[EMAIL PROTECTED]/srv/git/centerim.git
remote: Counting objects: 15024, done.
remote: Compressing objects: 100% (3051/3051), done.
Indexing 15024 objects.
78% (11767/15024) donee
remote: Total 15024 (delta 11954), reused 15017 (delta 11951)
100% (15024/15024) done
Resolving 11954 deltas.
100% (11954/11954) done
Checking files out...
100% (380/380) done
[~/c]$ cd centerim
[~/c/centerim]$ git checkout -b mob origin/mob
git checkout: branch mob already exists
[~/c/centerim]$ git branch
* master
mob
origin
xscrnsvr
[~/c/centerim]$ git checkout mob
[~/c/centerim]$ git branch
master
* mob
origin
xscrnsvr
[~/c/centerim]$ emacs kkconsui/src/texteditor.cc
... (changing)
[~/c/centerim]$ git status
# On branch refs/heads/mob
# Changed but not updated:
# (use git-update-index to mark for commit)
#
# modified: kkconsui/src/texteditor.cc
#
nothing to commit
[~/c/centerim]$ git add kkconsui/src/texteditor.cc
[~/c/centerim]$ git status
# On branch refs/heads/mob
# Changed but not updated:
# (use git-update-index to mark for commit)
#
# modified: kkconsui/src/texteditor.cc
#
nothing to commit
[~/c/centerim]$ git-update-index kkconsui/src/texteditor.cc
[~/c/centerim]$ git status
# On branch refs/heads/mob
# Updated but not checked in:
# (will commit)
#
# modified: kkconsui/src/texteditor.cc
#
[~/c/centerim]$ git commit
... (add description)
[~/c/centerim]$ git push
updating 'refs/heads/mob'
from 186141700cd7b7225b561d5ec4f6801506926ff2
to f30ce46dfcfb67d5e2c1522a213e145e1ece18e0
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)
--
_______________________________________________
Centerim-devel mailing list
[email protected]
http://centerim.org/mailman/listinfo/centerim-devel
http://www.centerim.org/
