kio_trash

[Alex Merry]

On 2014-09-22 21:26, David Faure wrote:
> On Saturday 13 September 2014 20:29:18 Luigi Toscano wrote:
>> Luigi Toscano ha scritto:
>> > Nicolás Alvarez ha scritto:
>> >> 2014-09-13 15:13 GMT-03:00 Nicolás Alvarez <nicolas.alvarez at gmail.com>:
>> >>> Done. The resulting history looks kind of weird though, because we
>> >>> have the full history of kio_trash but only partial history of kio, if
>> >>> you didn't graft kdelibs in.
>> >>
>> >> In fact, half the commits in kio are now from kio_trash. I didn't push
>> >> yet. I wonder if we should do the graft thing instead...
> 
> Strange, I didn't think there were that many commits to kio_trash.
> 
> Indeed, 618 commits - but just 388 after removing scripty.
> Most of them qt3->qt4 and qt4->qt5 porting ;)
> 
>> > It was already done for kdoctools (where you can see two parents). I would
>> > say it makes sense to import just the post-split commits, as you are
>> > grafting kdelibs anyway for kio history.
>> 
>> ... but kio_trash comes from kde-runtime. Well, double grafting is 
>> possible
>> and maybe easier than full import anyway.
> 
> I'm fine with grafting, although I guess git-qt-grafts won't work since 
> it
> only looks at the very first commit in the repo? So I guess this will 
> require
> manual grafting - which in my case means "cd 
> 4/kde/kde-runtime/kioslave/trash"
> will just be faster anyway.
> I still have some kde3 svn modules checked out, so I'll be keeping kde4 
> git
> modules around for a very long time I'm sure :-)

git-qt-grafts works just fine with multiple graft points. Remember that 
in git, there can be multiple "very first commits".

Alex