[Kde-scm-interest] A few questions. about Git Strategy

Thiago Macieira thiago at kde.org
Tue Mar 4 08:30:22 CET 2008


Boyd Stephen Smith Jr. wrote:
>I've read through the archives, but I apologize ahead of time if any of
>this is answered already.
>
>1. The import tool still chokes on svn:external, correct?

No, it simply ignores them. (choke means it can't parse and therefore 
stops)

>Any proposals 
> on how to handle them, like converting to submodules?  If not, how is
> progress going on removing svn:external from the existing tree?

I don't plan on converting them. The externals in use in the KDE tree 
right now will disappear with time, as soon as kdevelop and plasma mature 
a bit more.

>2. The current version of the import tool, including Thiago's fix for
> the double UTF-8 encoding, is @ http://repo.or.cz/w/fast-export.git ,
> correct? In particular, I'd like to lend some developer time toward the
> Git conversion.

Yes, that's the tool. It was just a dumb mistake that I fixed 5 minutes 
after the import was done. I just did not run the tool again.

>3. It seems to me like whatever the next VCS is, we need to find a way
> to live along-side SVN for an indeterminate period of time.  I wasn't
> around during the CVS -> SVN move, but they operated concurrently for
> some time, correct?  Has anyone started work on a set of scripts to
> keep the Git tree in sync with the SVN tree; I know Thiago said the
> current import script is not meant for running concurrently.  Still, it
> seems like concurrency is possible and can be made mostly automatic;
> totally automatic if we are willing to accept one tree "trumping" the
> other (it need not the the same tree the whole time).

No, CVS and SVN never operated concurrently. The conversion was wholesale 
and happened almost overnight. One day you worked on CVS, the other on 
SVN, for all modules.

For the next conversion, I don't think we need to convert all modules at 
once, since we're not creating one big repository, but splitting it.

I do not plan on doing SVN to Git or vice-versa conversion more than once 
for the same module. The conversion should happen wholesale for each 
module: once it's converted, you stop using SVN. We'll require the KDE 
sysadmins to add rules to make each of those repositories read-only.

-- 
  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/20080304/9c8c333e/attachment.pgp 


More information about the Kde-scm-interest mailing list