[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: Support for listing archives as directories
From:       Alex Merry <alex.merry () kde ! org>
Date:       2014-03-28 14:56:08
Message-ID: 53358D88.8080508 () kde ! org
[Download RAW message or body]

On 28/03/14 14:11, Frank Reininghaus wrote:
> Hi Aleix,
> 
> 2014-03-28 15:04 GMT+01:00 Aleix Pol <aleixpol@kde.org>:
>> On Fri, Mar 28, 2014 at 2:54 PM, Frank Reininghaus
>>  wrote:
>>>
>>> Hi,
>>>
>>> 2014-03-28 14:36 GMT+01:00 Frank Reininghaus <frank78ac@googlemail.com>:
>>>> Hi David,
>>>>
>>>> 2014-03-28 11:48 GMT+01:00 David Faure:
>>>> P.S.: I looked up Alex' commit on quickgit.kde.org and found that the
>>>> master branch of kio.git looks messed up pretty badly.
>>>
>>> I'll CC Aleix, who seems to be the committer of all those old commits
>>> in kio (which are probably unwanted).
>>>
>>> Regards,
>>> Frank
>>
>>
>> Sorry but I'm a bit lost, what did I do?
> 
> When looking at
> 
> http://quickgit.kde.org/?p=kio.git&a=shortlog
> 
> you see lots of old commits which have been pushed by you 44-47 hours
> ago, like this one:
> 
> http://quickgit.kde.org/?p=kio.git&a=commit&h=598b1d2f6d336869d5e28cee89211a095a6f56e2
> 
> I thought that this was unintended - so far, no framework contains any
> old kdelibs commits AFAIK, and all these old commits now make browsing
> the recent history of KIO a bit cumbersome. I had some trouble finding
> a recent commit of Alex'. (That commit was the reason why David
> started this thread).

Sounds like you didn't use fresh checkouts when doing the history
merges, and the grafted history got included.

Alex


[prev in list] [next in list] [prev in thread] [next in thread]