--===============1992233303849571973== Content-Type: multipart/alternative; boundary=047d7bdc8bc6a17bc704daf3d419 --047d7bdc8bc6a17bc704daf3d419 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable I have never tried this, but it is in the git book, so it may just work http://git-scm.com/book/en/Git-Tools-Subtree-Merging By having a hook on katepart commit, this could sync the tree in kdelibs. I am not sure if it apply or how it is currently done, just pointing out what this thread make me think. On 22 April 2013 06:08, Christoph Cullmann wrote: > Will check, thanks for notice! > > ----- Urspr=FCngliche Mail ----- > > El Diumenge, 21 d'abril de 2013, a les 12:47:41, Christoph Cullmann va > > escriure: > > > Guess so, fixed that by handling the error a bit different. > > > > Can you also have a look at this? > > > > $ LANG=3DC diff -rubq kate/ktexteditor/ ~/kdelibs/interfaces/ktextedito= r/ > > Files kate/ktexteditor/configinterface.h and > > /home/kdeunstable/kdelibs/interfaces/ktexteditor/configinterface.h diff= er > > Files kate/ktexteditor/highlightinterface.h and > > /home/kdeunstable/kdelibs/interfaces/ktexteditor/highlightinterface.h > differ > > Files kate/ktexteditor/loadsavefiltercheckplugin.h and > > > /home/kdeunstable/kdelibs/interfaces/ktexteditor/loadsavefiltercheckplugi= n.h > > differ > > Files kate/ktexteditor/recoveryinterface.h and > > /home/kdeunstable/kdelibs/interfaces/ktexteditor/recoveryinterface.h > differ > > > > Is there any reason these files would not be exactly the same? > > > > Cheers, > > Albert > > > > > > > > > > ----- Urspr=FCngliche Mail ----- > > > > > > > katedocmanager.cpp: In member function =91void > > > > KateDocManager::documentOpened()=92: > > > > katedocmanager.cpp:727:19: error: =91class KTextEditor::Document=92= has > no > > > > member named =91isOrphaned=92 > > > > > > > > I can see isOrphaned in kate copy but not in kdelibs one. > > > > > > > > Anyone can fix it? > > > > > > > > Cheers, > > > > > > > > Albert > > > > > > > > _______________________________________________ > > > > KWrite-Devel mailing list > > > > KWrite-Devel@kde.org > > > > https://mail.kde.org/mailman/listinfo/kwrite-devel > > > > -- > ----------------------------- Dr.-Ing. Christoph Cullmann --------- > AbsInt Angewandte Informatik GmbH Email: cullmann@AbsInt.com > Science Park 1 Tel: +49-681-38360-22 > 66123 Saarbr=FCcken Fax: +49-681-38360-20 > GERMANY WWW: http://www.AbsInt.com > -------------------------------------------------------------------- > Gesch=E4ftsf=FChrung: Dr.-Ing. Christian Ferdinand > Eingetragen im Handelsregister des Amtsgerichts Saarbr=FCcken, HRB 11234 > _______________________________________________ > KWrite-Devel mailing list > KWrite-Devel@kde.org > https://mail.kde.org/mailman/listinfo/kwrite-devel > --047d7bdc8bc6a17bc704daf3d419 Content-Type: text/html; charset=windows-1252 Content-Transfer-Encoding: quoted-printable I have never tried this, but it is in the git book, so it may just work
http://git-scm.com/book/en/Git-Tools-Subtree-Merging
By having a hook on katepart commit, this could sync the tree in= kdelibs. I am not sure if it apply or how it is=A0currently=A0done, just p= ointing out what this thread make me think.

On 22 April 2013 06:08, Christoph Cullmann <cullmann@absint.com><= /span> wrote:
Will check, thanks for notice!

----- Urspr=FCngliche Mail -----
> El Diumenge, 21 d'abril de= 2013, a les 12:47:41, Christoph Cullmann va
> escriure:
> > Guess so, fixed that by handling the error a bit different.
>
> Can you also have a look at this?
>
> $ LANG=3DC diff -rubq kate/ktexteditor/ ~/kdelibs/interfaces/ktextedit= or/
> Files kate/ktexteditor/configinterface.h and
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/configinterface.h dif= fer
> Files kate/ktexteditor/highlightinterface.h and
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/highlightinterface.h = differ
> Files kate/ktexteditor/loadsavefiltercheckplugin.h and
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/loadsavefiltercheckpl= ugin.h
> differ
> Files kate/ktexteditor/recoveryinterface.h and
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/recoveryinterface.h d= iffer
>
> Is there any reason these files would not be exactly the same?
>
> Cheers,
> =A0 Albert
>
>
> >
> > ----- Urspr=FCngliche Mail -----
> >
> > > katedocmanager.cpp: In member function =91void
> > > KateDocManager::documentOpened()=92:
> > > katedocmanager.cpp:727:19: error: =91class KTextEditor::Docu= ment=92 has no
> > > member named =91isOrphaned=92
> > >
> > > I can see isOrphaned in kate copy but not in kdelibs one. > > >
> > > Anyone can fix it?
> > >
> > > Cheers,
> > >
> > > =A0 Albert
> > >
> > > _______________________________________________
> > > KWrite-Devel mailing list
> > > KWrite-Devel@kde.org=
> > > https://mail.kde.org/mailman/listinfo/kwrite-devel=
>

--
----------------------------- Dr.-Ing. Christoph Cullmann ---------
AbsInt Angewandte Informatik GmbH =A0 =A0 =A0Email: cullmann@AbsInt.com
Science Park 1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 Tel: =A0 +49-681-38360-22
66123 Saarbr=FCcken =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0Fax: =A0
+49-681-38360-20
GERMANY =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0WWW:= =A0
http://www.AbsInt.= com
--------------------------------------------------------------------
Gesch=E4ftsf=FChrung: Dr.-Ing. Christian Ferdinand
Eingetragen im Handelsregister des Amtsgerichts Saarbr=FCcken, HRB 11234
_____________________________= __________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel

--047d7bdc8bc6a17bc704daf3d419-- --===============1992233303849571973== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ KWrite-Devel mailing list KWrite-Devel@kde.org https://mail.kde.org/mailman/listinfo/kwrite-devel --===============1992233303849571973==--