[Kde-scm-interest] KDE trunk imported into Git

[Thiago Macieira]

Max Hofer wrote:
>>Apparently Mercurial comes with a nifty tool that allows us to convert
>> from
>>
>>Git to Mercurial.
>>
>>
>>
>>So I ran:
>>
>>$ hg convert git3/KDE/kdelibs hg/kdelibs
>
>I never used convert (because it did not exits at the time when we
> ported svn/cvs
>
>projects into our git repository). But i think it would be a better idea
> to convert
>
>the subversion repository directly into the hg (svn --> hg) instead
> making a detour
>
>over git (svn --> git --> hg).

It might, but I fear that the complexity of our SVN repo will make that 
task extremely difficult. Besides, I do not want to take over the 
Mercurial conversion -- I just did the convert because it was easy to do.

>>However, hg seems to have a weird notion of branches:
>>
>>$ hg branches
>>
>>default                        74638:9cd90cab9ac2
>
>Could you explain  "weired"?

Yes: the hg convert operation imported all Git branches into the same 
Mercurial repository, under a single branch name.

Inspecting the history shows that there are several different tips of the 
commit trees around. But the "tip" (74638 above) isn't the latest commit 
on the Git "master" branch or Subversion trunk. See below.

>The concept of branches used by svn/cvs is called in Mercurial "named
> branches" which means you can create a branch in a repository
>(see http://hgbook.red-bean.com/hgbookch8.html#x12-1650008.5).

The hg convert tool seems to have completely missed (or messed up) the 
named branches then.

>>$ hg log -r .
>>changeset:   73049:954ea2f61d88
>>user:        Fredrik Höglund <fredrik at kde.org>
>>date:        Thu Dec 27 20:31:03 2007 +0000
>>summary:     Implement support for repeat-x, repeat-y and no-repeat in
>>CanvasPatternImpl.
>>
>>Which matches the tip of refs/heads/master in the Git repository,
>> including the broken encoding of the committer's name.
>
>Maybe hg would deal correctly with the broken encoding if you would
> convert it directly from the subversion repository - try it.

The encoding error was a fault in my conversion tool from Subversion to 
Git. It's already been fixed. But the point here was: the import appears 
to be ok, including the import errors.

>Since i never played with the convert tool I think you should ask for
> help on the mercurial mailing list. They are very helpful
>(http://www.selenic.com/mailman/listinfo/mercurial/).

No, sorry.

I have no interest in doing that.

I am spearheading the Git conversion. That's the system I understand and 
that's the one I will work with. I will not do the Mercurial conversion. 
I only did the "hg convert" because it was a simple one-line command.

If someone wants Mercurial to have a chance of being the KDE DSCM, he'll 
have to start the work himself.

-- 
  Thiago Macieira  -  thiago (AT) macieira.info - thiago (AT) kde.org
    PGP/GPG: 0x6EF45358; fingerprint:
    E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20080202/dd352faf/attachment.pgp