KDESDK to git migration: how many repos for the small developer utils?

Hi,

[[cc: to kde-scm-interest just for heads-up,
  follow-ups _only_ on kde-sdk-devel please]]

so we are in Phase 1 of the process:
	"Decide which repos should be created from which submodules".

For the kind-of-standalone programs and the plugins it seems there is 
consensus how they should be split, a repo per program as well as a repo per 
plugin type.

But what about all those small developer utils?
There are some for developers using... 
... KDE libs/framework: 
* kpartloader - David Faure 
* scripts - Michael Pyne 

... Qt libs/framework: 
* kuiviewer - Benjamin C. Meyer 
* kprofilemethod - David Faure 

... X libs: 
* kstartperf - Geert Jansen 

... C++(/C?): 
* kmtrace - ? 

How should these submodules be split? 
a) One repo with all? 

Migration of KDESDK to git, finally? :)

Hi,

KDESDK currently is still in svn. At least for Okteta I would like to have
a move from svn to git as soon as possible.

While there have been two threads about this on this list,
"migration of kdesdk to git - status?" from 18.12.2010 and
"Idea: Converting KDESDK incrementally" from 28.03.2011, so far
nothing has happened, besides Kate and kdesrc-build having moved out
of KDESDK to other modules. I would like to change that and have something
happening :)

The gist from the threads is that
* the KDESDK module should be split into separate repos, as the single
  submodules do not have anything in common, like libs or stuff
* the whole of KDESDK should be moved to git in one step, to reduce the mess
  for release managers, packagers and friends
Anyone disagrees?

Some brave people seem to have prepared set of rules for all the components
of the KDESDK module (thanks to them), see
https://projects.kde.org/projects/playground/sdk/kde-
ruleset/repository/revisions/master/show/kdesdk
What is the state of these rules? Can the result be checked somewhere?
Niko Sams, in the thread "migration of kdesdk to git - status?" as referenced
above you also talked about having prepared rules, are they in some way
integrated in what is in the repo linked above?

Who are the current maintainers of all the submodules in KDESDK? I tried to
put all in cc: which looked like the one, see also below who I listed

svn2git: Representing old work that does not have a direct connection to current master

Hi,

I'm working on kdegames/palapeli-rules. Palapeli lived in
playground/games for a very long time. 1.5 years into its development,
I decided to rewrite it from scratch using the lessons I learned over
the time.

So I moved the directory trunk/playground/games/palapeli to
trunk/playground/games/palapeli.old and started development of the
rewrite at the old path trunk/playground/games/palapeli. I kept the
old source code in the "palapeli.old" directory for a month to use it
as a reference when writing the new code. (I did not know about "svn
checkout -R" back then.)

In the rules, I'm thinking of

1. using the parentmap to make the first commit on the new Palapeli
(1028102) the parent of the last commit of the old Palapeli (1024816)
and

2. omitting those commits which move the old code to "palapeli.old"
(1028097) and delete this directory a month later (1043580).

This should maintain temporal and contextual order without introducing
additional branches. Is this a good idea? If not, what do you suggest?

Greetings
Stefan

superbuild: git clone dir gets removed when rebuilding cache

Hello Alex,

Looking for a hint to better superbuild.
Here is my case (once again :) )

I configured superbuild to get the sources in a separate, global, 
directory. I added this into the GlobalSuperbuildOptions.cmake:

set(SB_SRC_CLONE_DIR $ENV{KDEDIR}/src)
(please see my last commit 3ec2909821e408fad6, which introduces this 
variable)

I then do this:
cd kdesupport/
mkdir build
cd build
cmake ..
cmake-gui .. [then I configure the build]
make

Please note that before doing this, my KDEDIR/src already has clones of 
the ldesupport components.
However, doing make would delete the corresponding directories, then 
re-clone them.
Here is an example of the output for LibStreamAnalyzer

Scanning dependencies of target LibStreamAnalyzer
[ 50%] Creating directories for 'LibStreamAnalyzer'
[ 50%] Performing download step (git clone) for 'LibStreamAnalyzer'
Cloning into 'LibStreamAnalyzer'...

Moving a directory from one KDE repository to another

What is the best way to move a directory from one KDE repository to another, while preserving history? Is the
sequence of commands in http://lists.kde.org/?l=kde-scm-interest&m=129019711601449&w=2 a good
way? I wonder whether the --tag-name-filter option to git filter-branch should also be used to preserve tags.

--

-- 
David Jarvie.
KDE developer.
KAlarm author -- http://www.astrojar.org.uk/kalarm

Deactivating this list

Hello

The Git conversion of the KDE repositories is almost complete. There have been 
a grand total of 2 emails in the past 30 days on this mailing list. Meanwhile, 
the spam traffic has increased quite considerably (> 1 spam per day).

I'd like to propose this list be deactivated on Dec 1st. That gives us 45 days 
to wrap up any subjects pending.

Any objections?

--

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
   Software Architect - Intel Open Source Technology Center
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358

Git User's Survey 2011

Go forth and participate: https://www.survs.com/survey/VCAGZA8CT5

--

-- 
Best regards,
Eike Hein

[Kde-games-devel] Data files and the Git move

For some reason GMail did not include the mailinglists, so FWD.

---------- Forwarded message ----------
From: Stefan Majewsky <stefan.majewsky@...>
Date: Tue, Sep 6, 2011 at 10:10 AM
Subject: Re: [Kde-scm-interest] [Kde-games-devel] Data files and the Git move
To: Johannes Sixt <j.sixt@...>

On Mon, Sep 5, 2011 at 3:12 PM, Johannes Sixt <j.sixt@...> wrote:
> But if you *have* to download the data files (and it seems that is
> necessary to build and install kdegames), you can just as well have a
> shallow clone of depth 1 in git. And then it does not matter whether you
> downloaded 200MB using git or SVN.

The important point in the proposal is that kdegames-data has no
dependency on kdegames, and can therefore be packaged separately. When
a drive-by contributor chooses to hack on kdegames, he of course has
to compile the application, but can rely on the data which is already
available on his system through packages.

This relation of course needs to be documented clearly. A README in
the source repo could state that the data is in a separate repository,
and that usually the data package shipped by the distribution is fine.
Additionally, the application's build system should consider the data
as a required dependency.

Greetings
Stefan

Moving code across repositories

Hi

I think we need a nice howto on how to move code from one repository to
another.

I at least need some code from kde-runtime over in kdelibs for the
frameworks effort, and is a bit unsure how to actually do that.

Any help, ideas and nice scripts are welcome.

/Sune

pushing rebased shared branches

Hi,

I have been fixing branches of SoK students, removing some dirty manual merges 
and branch mixups, by interactive rebase.
I'm fully aware of the implications of rewriting history. 

I had the recollection we could now force-push branches, but:

remote: + refs/heads/sok/presentation digikam mwiesweg DENIED by fallthru
remote: error: hook declined to update refs/heads/sok/presentation
To ssh://git@.../digikam
 ! [remote rejected] presentation -> sok/presentation (hook declined)

Missing something here?

I believe I can delete branches, so the alternative procedure would be to 
delete the branch and recreate it under the same name?

Marcel

git BoF