Review Request 115185: Integrate kf5dot

[Aurélien Gâteau]

On Jan. 21, 2014, 6:16 p.m., Aurélien Gâteau wrote:
> > Another option for merging histories is http://thread.gmane.org/gmane.comp.version-control.git/5126/ (with some modifications; in particular, git-*-cache is now git-*-index).  But that depends on how much you care about preserving commit shasums.
> > 
> > In general, though, I approve :-)

In this case I don't care about the checksums, I just want to preserve the commit diffs and messages.


- Aurélien


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/115185/#review47903
-----------------------------------------------------------


On Jan. 21, 2014, 5:58 p.m., Aurélien Gâteau wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115185/
> -----------------------------------------------------------
> 
> (Updated Jan. 21, 2014, 5:58 p.m.)
> 
> 
> Review request for KDE Frameworks and Alex Merry.
> 
> 
> Repository: kapidox
> 
> 
> Description
> -------
> 
> This big patch includes all of the kf5dot repository inside kapidox. Python code is in src/kapidox/kf5dot, scripts are in src/.
> 
> I replayed all the commits from the kf5dot repository within the kapidox repository using `git am` to avoid loosing history. As such, I plan to do the merge using --no-ff.
> 
> 
> Diffs
> -----
> 
>   src/kapidox/kf5dot/frameworkdb.py PRE-CREATION 
>   src/kf5dot-generate PRE-CREATION 
>   src/kf5dot-generate-all PRE-CREATION 
>   src/kf5dot-prepare PRE-CREATION 
>   README.md 660e9c3 
>   src/kapidox/kf5dot/framework.py PRE-CREATION 
>   setup.py 025afdb 
>   src/kapidox/kf5dot/.gitignore PRE-CREATION 
>   src/kapidox/kf5dot/block.py PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/115185/diff/
> 
> 
> Testing
> -------
> 
> Generated all diagrams. Works as expected.
> 
> 
> Thanks,
> 
> Aurélien Gâteau
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140122/ab26e20a/attachment.html>