Re: Git merge checking
On 16/01/14 23:53, Luigi Toscano wrote: > I can retrieve the full history using grafts. Only two details: > - flat.css, kde.css and print.css are part of the doxygen stuff, they should > be in the other repository; Good catch. > - mainfooter.html and mainheader.html have been removed from both > repositories, but they are (were) part of doxygen stuff. Is it correct? They were unused, so no point keeping them. Alex ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Re: Git merge checking
Alex Merry wrote: > I've done some git magic to copy the common/ directory (or, at least, > the relevant parts) from kapidox to kdoctools (where those files should > be located) in a history-preserving manner (for > https://git.reviewboard.kde.org/r/114969/). Thanks for the effort! > This can be found at kde:clones/kdoctools/alexmerry/kapidox-merge > > Can someone check that this looks sensible before I push it to the > actual kdoctools repo? I can retrieve the full history using grafts. Only two details: - flat.css, kde.css and print.css are part of the doxygen stuff, they should be in the other repository; - mainfooter.html and mainheader.html have been removed from both repositories, but they are (were) part of doxygen stuff. Is it correct? Ciao -- Luigi ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
Git merge checking
I've done some git magic to copy the common/ directory (or, at least, the relevant parts) from kapidox to kdoctools (where those files should be located) in a history-preserving manner (for https://git.reviewboard.kde.org/r/114969/). This can be found at kde:clones/kdoctools/alexmerry/kapidox-merge Can someone check that this looks sensible before I push it to the actual kdoctools repo? Note that this means that kdoctools will have two roots; if you graft on the kdelibs history, though, those two roots will have the same parent. Alex ___ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
