[prev in list] [next in list] [prev in thread] [next in thread]
List: kwrite-devel
Subject: Re: Forgot to commit to kdelibs?
From: Emmanuel_Lepage-Vallée <elv1313 () gmail ! com>
Date: 2013-04-22 14:24:46
Message-ID: CAFnK6VVqDarsUCK55UZ7p89AP4Hw8FzmXtsreGUkSh8cSz7DEg () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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 <cullmann@absint.com> wrote:
> Will check, thanks for notice!
>
> ----- Ursprüngliche 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=C diff -rubq kate/ktexteditor/ ~/kdelibs/interfaces/ktexteditor/
> > Files kate/ktexteditor/configinterface.h and
> > /home/kdeunstable/kdelibs/interfaces/ktexteditor/configinterface.h differ
> > 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/loadsavefiltercheckplugin.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üngliche Mail -----
> > >
> > > > katedocmanager.cpp: In member function ‘void
> > > > KateDocManager::documentOpened()’:
> > > > katedocmanager.cpp:727:19: error: ‘class KTextEditor::Document’ has
> no
> > > > member named ‘isOrphaned’
> > > >
> > > > 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ücken Fax: +49-681-38360-20
> GERMANY WWW: http://www.AbsInt.com
> --------------------------------------------------------------------
> Geschäftsführung: Dr.-Ing. Christian Ferdinand
> Eingetragen im Handelsregister des Amtsgerichts Saarbrücken, HRB 11234
> _______________________________________________
> KWrite-Devel mailing list
> KWrite-Devel@kde.org
> https://mail.kde.org/mailman/listinfo/kwrite-devel
>
[Attachment #5 (text/html)]
I have never tried this, but it is in the git book, so it may just \
work<div><br></div><div><a \
href="http://git-scm.com/book/en/Git-Tools-Subtree-Merging">http://git-scm.com/book/en/Git-Tools-Subtree-Merging</a></div><div><br>
</div><div>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.<br><br><div class="gmail_quote"> On 22 April 2013 06:08, \
Christoph Cullmann <span dir="ltr"><<a href="mailto:cullmann@absint.com" \
target="_blank">cullmann@absint.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> Will check, thanks for notice!<br>
<br>
----- Ursprüngliche Mail -----<br>
<div class="HOEnZb"><div class="h5">> El Diumenge, 21 d'abril de 2013, a les \
12:47:41, Christoph Cullmann va<br> > escriure:<br>
> > Guess so, fixed that by handling the error a bit different.<br>
><br>
> Can you also have a look at this?<br>
><br>
> $ LANG=C diff -rubq kate/ktexteditor/ ~/kdelibs/interfaces/ktexteditor/<br>
> Files kate/ktexteditor/configinterface.h and<br>
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/configinterface.h differ<br>
> Files kate/ktexteditor/highlightinterface.h and<br>
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/highlightinterface.h differ<br>
> Files kate/ktexteditor/loadsavefiltercheckplugin.h and<br>
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/loadsavefiltercheckplugin.h<br>
> differ<br>
> Files kate/ktexteditor/recoveryinterface.h and<br>
> /home/kdeunstable/kdelibs/interfaces/ktexteditor/recoveryinterface.h differ<br>
><br>
> Is there any reason these files would not be exactly the same?<br>
><br>
> Cheers,<br>
> Albert<br>
><br>
><br>
> ><br>
> > ----- Ursprüngliche Mail -----<br>
> ><br>
> > > katedocmanager.cpp: In member function ‘void<br>
> > > KateDocManager::documentOpened()’:<br>
> > > katedocmanager.cpp:727:19: error: ‘class KTextEditor::Document’ has \
no<br> > > > member named ‘isOrphaned’<br>
> > ><br>
> > > I can see isOrphaned in kate copy but not in kdelibs one.<br>
> > ><br>
> > > Anyone can fix it?<br>
> > ><br>
> > > Cheers,<br>
> > ><br>
> > > Albert<br>
> > ><br>
> > > _______________________________________________<br>
> > > KWrite-Devel mailing list<br>
> > > <a href="mailto:KWrite-Devel@kde.org">KWrite-Devel@kde.org</a><br>
> > > <a href="https://mail.kde.org/mailman/listinfo/kwrite-devel" \
target="_blank">https://mail.kde.org/mailman/listinfo/kwrite-devel</a><br> ><br>
<br>
</div></div><div class="im HOEnZb">--<br>
----------------------------- Dr.-Ing. Christoph Cullmann ---------<br>
AbsInt Angewandte Informatik GmbH Email: cullmann@AbsInt.com<br>
Science Park 1 Tel: <a href="tel:%2B49-681-38360-22" \
value="+496813836022">+49-681-38360-22</a><br> 66123 Saarbrücken \
Fax: <a href="tel:%2B49-681-38360-20" \
value="+496813836020">+49-681-38360-20</a><br> GERMANY \
WWW: <a href="http://www.AbsInt.com" \
target="_blank">http://www.AbsInt.com</a><br>
--------------------------------------------------------------------<br>
Geschäftsführung: Dr.-Ing. Christian Ferdinand<br>
Eingetragen im Handelsregister des Amtsgerichts Saarbrücken, HRB 11234<br>
</div><div class="HOEnZb"><div \
class="h5">_______________________________________________<br> KWrite-Devel mailing \
list<br> <a href="mailto:KWrite-Devel@kde.org">KWrite-Devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/kwrite-devel" \
target="_blank">https://mail.kde.org/mailman/listinfo/kwrite-devel</a><br> \
</div></div></blockquote></div><br></div>
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic