[Kde-scm-interest] Kopete git migration

Jeremy Whiting jpwhiting at kde.org
Fri May 24 19:58:23 UTC 2013


Hi Urs,


On Fri, May 24, 2013 at 10:38 AM, Urs Wolfer <uwolfer at kde.org> wrote:

> Hi Jeremy
>
> Now it looks like tags got lost?
>

Nope, I just forgot to push them, pushing them now.


>
> CMakeList.txt history looks good IMHO now.
>
> Also, I think you can drop the branch "make_kget_cool" if you do not have
> any reason for keeping it. Do you think there is no need for an "orignal"
> branch because the "make_kget_cool" branch is based (?) on this branch?
>

Ok, we can easily delete that branch afterwards, we could make the "master"
branch before rev 478995 on an "original" branch. I'll look into that.  I
think the existing make_kget_cool branch that's also master works ok and we
can just nuke make_kget_cool before pushing since it's very old.

BR
Jeremy


>
> Bye
> urs
>
>
> On 2013-05-23 18:46, Jeremy Whiting wrote:
>
>> ok, fixed the rules a bit by adding the work branch make_kget_cool and
>> pushed to scratch/whiting/kget.  It looks good except for an old
>> master branch of doc stuff that didn't get merged in somehow
>> (something wrong with the rules only I'm
>> sure). http://quickgit.kde.**org/?p=scratch%2Fwhiting%**
>> 2Fkget.git&a=history&h=**dd40536f1643209d157cba75adc70f**
>> e36712e05f&f=CMakeLists.txt<http://quickgit.kde.org/?p=scratch%2Fwhiting%2Fkget.git&a=history&h=dd40536f1643209d157cba75adc70fe36712e05f&f=CMakeLists.txt>
>> [3] looks like it includes all history for CMakeLists.txt now.  I'll
>>
>> look at the master branch with doc stuff in a bit and then we should
>> be good to go I believe.
>>
>> BR
>> Jeremy
>>
>> On Wed, May 22, 2013 at 9:05 AM, Jeremy Whiting <jpwhiting at kde.org>
>> wrote:
>>
>> Urs,
>>
>> Hmm, looking at the kget git repo I have here I do have make_kget_cool
>> branch, but it only goes to rev 407833, also I have a master branch that
>> ends at one point.  I'll see what I can do to clean this up and let you
>> know.
>>
>> BR,
>> Jeremy
>>
>> On Wed, May 22, 2013 at 12:44 AM, Urs Wolfer <uwolfer at kde.org> wrote:
>> Hi Jeremy
>>
>> Lukas Appelhans has noticed an issue in KGet:
>>
>> "I'm missing a bit history here. Compare these two:
>> http://quickgit.kde.org/?p=**scratch%2Fwhiting%2Fkget.git&**a=history&h=*
>> *be2aa17d34ebc12e82a5d9275ed0f5**97ee41929f&f=CMakeLists.txt&**pg=1<http://quickgit.kde.org/?p=scratch%2Fwhiting%2Fkget.git&a=history&h=be2aa17d34ebc12e82a5d9275ed0f597ee41929f&f=CMakeLists.txt&pg=1>[1]
>> and
>> http://websvn.kde.org/trunk/**KDE/kdenetwork/kget/**
>> CMakeLists.txt?view=log<http://websvn.kde.org/trunk/KDE/kdenetwork/kget/CMakeLists.txt?view=log>[2]
>>
>>
>> The branched commits show fine in websvn (make_kget_cool, at the end),
>> while in git, your merge commit is the first one. Is that expected
>> behavior?"
>>
>> Jeremy, I think you could do it like KRDC: make a branch "original" with
>> all the old commits, and put all commits from the "make_kget_cool" branch
>> into master. Also you can drop the Git branch "make_kget_cool".
>>
>> Bye
>> urs
>>
>> On 2013-05-17 18:19, Jeremy Whiting wrote:
>> On Fri, May 17, 2013 at 9:22 AM, Urs Wolfer <uwolfer at kde.org> wrote:
>>
>> Ok, I have mailed all maintainers. Once we get their approval, we can
>> start the final migration :)
>>
>> Should I request Git repos for every project from KDE sysadmins?
>>
>> Yes, you can, make sure you ask to add me (whiting) as a Project
>> Manager so I can push the conversions.
>>
>> Pali, I'm using the modified svn-all-fast-export to match files, does
>> my kopete git repo on scratch/whiting/kopete differ from yours?  If
>> not it'd probably be simplest for me to just push all the conversions
>> from here when we do the final one.
>>
>> BR,
>> Jeremy
>>
>>
>> @Pali: What do you think about Kopete? Is it also ready?
>>
>> Bye
>> urs
>>
>> On 2013-05-17 17:01, Jeremy Whiting wrote:
>>
>> On Thu, May 16, 2013 at 11:48 PM, Urs Wolfer <uwolfer at kde.org> wrote:
>>
>> Hi Jeremy
>>
>> I have had a look at KRDC and it looks really good. I have found no
>> issues so far.
>>
>> So, what's next? Do you think the scripts are almost ready? If yes, I
>> think I will notify all maintainers again to check their converted repos.
>>
>> Yes, I think it's in very good shape.  If you could get maintainers to
>> check their repos that would be great.  And update the table in the
>> wiki page accordingly.
>>
>> BR,
>> Jeremy
>>
>>
>>
>> Links:
>> ------
>> [1]
>> http://quickgit.kde.org/?p=**scratch%2Fwhiting%2Fkget.git&**
>> amp;a=history&h=**be2aa17d34ebc12e82a5d9275ed0f5**
>> 97ee41929f&f=CMakeLists.**txt&pg=1<http://quickgit.kde.org/?p=scratch%2Fwhiting%2Fkget.git&a=history&h=be2aa17d34ebc12e82a5d9275ed0f597ee41929f&f=CMakeLists.txt&pg=1>
>> [2] http://websvn.kde.org/trunk/**KDE/kdenetwork/kget/**
>> CMakeLists.txt?view=log<http://websvn.kde.org/trunk/KDE/kdenetwork/kget/CMakeLists.txt?view=log>
>> [3]
>> http://quickgit.kde.org/?p=**scratch%2Fwhiting%2Fkget.git&**
>> amp;a=history&h=**dd40536f1643209d157cba75adc70f**
>> e36712e05f&f=CMakeLists.**txt<http://quickgit.kde.org/?p=scratch%2Fwhiting%2Fkget.git&a=history&h=dd40536f1643209d157cba75adc70fe36712e05f&f=CMakeLists.txt>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-scm-interest/attachments/20130524/c5c1305d/attachment.html>


More information about the Kde-scm-interest mailing list