[Uml-devel] Move Umbrello to git

Emmanuel Lepage-Vallée elv1313 at gmail.com
Sat Sep 1 19:09:16 UTC 2012


I don't think anyone is against, this have been discussed many times
before. If I recall, there is a thread dating ~9 month about this. There is
a series of issues to overcome, but the most serious one is time. Some
commits have already been made to fix the most serious ones. If you do have
time, please go ahead (opinion). You have to note that there is already
many Git and SVN branches around and they have to be merged back together.
A good dose of git filter-branch and git svn import should do it. I can
merge my own branches once the git repo is ready. But there is also the
GSOC2008 and GSOC2011 branches (they are active branches, not relics of the

Here are some links you might want to know exist:
the two svn branches are on kde.org repository. My branches are on github,
but they need to be rebased first, do not merge as is, I will take care of
that. As you probably know, there is #kde-git and #kde-sysadmin IRC
channels on freenode and documentation on KDE techbase on how to port SVN
to Git. The script wont run clear, I already tried, it wont be that easy.

Good luck!

The thread I was talking about:

---------- Forwarded message ----------
From: Emmanuel Lepage-Vallée <elv1313 at gmail.com>
Date: 17 January 2012 23:32
Subject: Re: [Uml-devel] Git-Migration
To: UML Modeller Devel <umbrello-devel at kde.org>

Hi, my vast array of spybot detected I was needed in this discussion
(joking, I am just member of the list). So yes, I was previously interested
in switching to git. I have several branches myself already using git, but
it is not a migration, nothing like one.

So point by point (read previous email):
Umbrello can still be part of KDESDK and be in a separate repository, just
like Kate. Git does not really handle subprojects in repositories, so it is
the only way to go. I don't think we can keep sharing the same repositories
as KDESDK. No other KDE project did when migrating.

Yes, it need to be done

I think we need to move it. We can ask on #kde-sysadmin for a better

All of them, but keep the log of master while integrating the other one as a
single block of the git and make them ready for a "git merge master" (when
possible/applicable). Like that it would be possible to start cherry-picking
commits or merging different branches. I think using trunk as the master is
the best idea to keep the best possible commit log.

Guys on #kde-sysadmin probably know better they did a lot of project

I have started a migration some months ago, but gave up after having some
problems. I code on many projects, but not at once, so until I come back to
Umbrello, I can't put much time on this. I work almost full time as a IT
consultant and got full time at school at once, so I have limited time, I
can only work on one project at once. Right now I have pressure from my
users to work on something else, so until it is done Umbrello will have to
wait. I still think my code is useful for the project and deserve to be
merged for what it add. But not right now and not for the next ~2 month.

We should use KDE identity service and let anybody with a KDE account work
on the project. It is what is so great about KDE, we are one community, not
a bunch of loosely related ones. I don't see any reasons why this should
change. As for repo maintainer, it can be decided later. SVN never really
required one. While having a "master integrator" in git is useful, it is not

Yes, but not at this time. Everything else can wait until the transition is
done. We need to see the branching model we will use (one branch per
bug/feature or 1 branch per dev (personal playground model)?)

On 17 January 2012 18:03, Ralf Habacker <ralf.habacker at googlemail.com>
> Am 13.01.2012 00:11, schrieb Andi Fischer:
> > Am 12.01.2012 23:34, schrieb Ralf Habacker:
> >> Are there any plans to migrate to git for easier branch and merge
> >> management ?
> >>
> >> Regards
> >>    Ralf
> > Not yet. That would be very cool.
> >
> > To do that the following has to be done: (see also
> > http://techbase.kde.org/Projects/MovetoGit)
> > - write some importing rules
> > - buy a big hard drive
> Here are a few notes and questions:
> 1. umbrello is currently a part of the kdesdk package. Should this be
> the prefered way in he future or should umbrello goes into a separate
> git repository?
> 2. a separate repo means to convert umbrello to a standalone cmake
> package.
> 3. umbrello doc is not a part of the recent umbrello subdir - how to
> proceed ? let it still be in kdesdk or move to umbrello source ?
> 4. umbrello uses several branches - which one need to be migrated and
> which one could be dropped ?
> 5. The main documentation for a migration into a  kde git repository
> could be found on http://techbase.kde.org/Projects/MoveToGit/StepsToMove
> - there is a detailed plan
> 6  In this doc there is no hint about how to migrate the translation
> service
> 7. Who will do the migration - Jonathan mentioned that  Emmanueel Lepage
> Vallee (Elv13) who pops up on IRC occationally has been interested in
> doing this in the past, he needs to be contacted
> 8. Who should have write access to this repo - who should be the
> maintainer of the repository ?
> 9. Are there any missing topics ?
> Regards
>  Ralf
> Keep Your Developer Skills Current with LearnDevNow!
> The most comprehensive online learning library for Microsoft developers
> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
> Metro Style Apps, more. Free future releases when you subscribe now!
> http://p.sf.net/sfu/learndevnow-d2d
> _______________________________________________
> Uml-devel mailing list
> umbrello-devel at kde.org
> https://mail.kde.org/mailman/listinfo/umbrello-devel

On 1 September 2012 14:30, Tomaz Canabrava <tcanabrava at kde.org> wrote:

> Hello,
> I'm with a three students team that will start taking care of Umbrello
> for six months as Curricular Work for the university. One of the
> reasons that Umbrello is stuck at the 2000's is SVN, so we are
> planning to move it to git. does anyone have anythign against the
> move?
> Tomaz Canabrava
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Uml-devel mailing list
> umbrello-devel at kde.org
> https://mail.kde.org/mailman/listinfo/umbrello-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/umbrello-devel/attachments/20120901/54fa3774/attachment.html>

More information about the umbrello-devel mailing list