[Kde-games-devel] Fwd: Trouble setting up scratch repo for kdiamond

Sat Jun 2 10:03:07 UTC 2012

Hi,

The alternative I followed was:

1. Simply copy-paste the latest code from SVN into the empty Git repo
2. Add all of the code in the first commit, and tag that commit with
"svn-import"
3. Push the commit and start working there of
4. Later when the Git repo for existing SVN code is ready, the commits from
the scratch repo can simply be "appended" to the converted Git repo

This worked for me, and I believe step-4 is well possible, so this approach
is
not a bad idea, imo.

On Sat, Jun 2, 2012 at 7:01 AM, Frederik Schwarzer <schwarzer at kde.org>wrote:

> Hi,
>
> let her ask the Sysadmins to disable the hooks for the scratch repo.
> Either on IRC (Freenode: #kde-sysadmin) or via a sysadmin request:
> https://bugs.kde.org/enter_sysadmin_request.cgi
>
> That should solve it.
>
> The problem is, that the email address is not correctly set during
> this kind of "transition" and thus is not Valid
> (majewsky at 283d02a7-25f6-03[...]).
>
> Regards
>
> Am Samstag, 2. Juni 2012, 01:59:15 schrieb Ian Wadham:
> > Avnee (one of our GSoC students) has had trouble setting up her
> > scratch GIT repository for the QML version of KDiamond.
> >
> > Please can someone here help her.  Stefan perhaps.  Unfortunately I
> > cannot: I do not know enough about GIT.  Details are forwarded
> > below.
> >
> > All the best, Ian W.
> >
> > Begin forwarded message:
> > > From: Avnee Nathani <avnee.nathani at gmail.com>
> > > Subject: Setting up scratch repo for kdiamond
> > > Date: 2 June 2012 2:17:04 AM AEST
> > > To: Ian Wadham <iandw.au at gmail.com>
> > >
> > > Hello Ian
> > >
> > > Hope you are doing good. I have been trying to set up my scratch
> > > repository today, this is how it went,
> > >
> > > According to Stefan ( in the thread, "GIT Conversion status"), I
> did the following:
> > >    mkdir git-kdiamond
> > >    cd git-kdiamond
> > >    git svn init
> > >    svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond
> > >    git svn fetch -r 1294007
> > >    git svn fetch
> > >    git svn rebase
> > >    git log
> > >
> > > The log shows me [1]
> > >
> > > Next what I did is,
> > >
> > >    git remote add origin kde:scratch/nathani/kdiamond
> > >    git config branch.master.remote origin
> > >    git config branch.master.merge refs/heads/master
> > >    git push origin master
> > >
> > > However, this is what I get [2]. I don't know what's going wrong
> > > here, I tried searching the web but no luck. I followed the
> > > following techbase article,
> > > http://community.kde.org/Sysadmin/GitKdeOrgManual#Personal_scratc
> > > h_repositories
> > >
> > > I see an empty repository "kdiamond" created on quickgit, here is
> > > the link,
> > > http://quickgit.kde.org/index.php?p=scratch%2Fnathani%2Fkdiamond
> > > .git&a=summary
> > >
> > > Please guide me further on this.
> > >
> > > Thanks and regards
> > > Avnee
> > >
> > > ==========================================================
> > > [1] commit 71360941d1ab81839fc63a63be2ec3460e68961e
> > > Author: majewsky <majewsky at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
> > > Date:   Thu May 10 19:49:58 2012 +0000
> > >
> > >     Allow split build for all games except libkmahjongg
> > >     dependencies.
> > >
> > >     Most of this is straightforward. Some more complicated
> > >     changes are in 1. libkdegames: I needed to fix the headers
> > >     <KgAudioScene> and
> > >
> > >        <KgSound>, which did not refer to the right include
> > >        location when installed.
> > >
> > >     2. kgoldrunner: Its CMake code may not depend on OpenAL and
> > >     libsndfile
> > >
> > >        anymore. KGoldRunner therefore now uses the new
> > >        <libkdegames_capabilities.h> header and enables sound only
> > >        if KGAUDIO_BACKEND_OPENAL is set.
> > >
> > >     KMahjongg and KShisen are not done yet. I could not create a
> > >     config-script for KMahjongg because CMake currently gets
> > >     confused over exported targets in multiple source
> > >     directories. (D'oh...)
> > >
> > >     git-svn-id:
> > >     svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond@1
> > >     294007 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
> > >
> > > ============================================================
> > > [2] Initialized empty Git repository in
> > > /srv/kdegit/repositories/scratch/nathani/kdiamond.git/ Counting
> > > objects: 53, done.
> > > Compressing objects: 100% (51/51), done.
> > > Writing objects: 100% (53/53), 3.97 MiB | 50 KiB/s, done.
> > > Total 53 (delta 3), reused 0 (delta 0)
> > > remote: Audit failure - Commit
> > > 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky
> > > remote: Audit failure - Commit
> > > 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky
> > > remote: Audit failure - Commit
> > > 71360941d1ab81839fc63a63be2ec3460e68961e - Email Address -
> > > majewsky at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da remote: Audit
> > > failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e -
> > > Email Address - majewsky at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
> > > remote: Push declined - commits failed audit
> > > remote: error: hook declined to update refs/heads/master
> > > To git at git.kde.org:scratch/nathani/kdiamond
> > >
> > >  ! [remote rejected] master -> master (hook declined)
> > >
> > > error: failed to push some refs to
> > > 'git at git.kde.org:scratch/nathani/kdiamond'
> > > ============================================================
>
> _______________________________________________
> kde-games-devel mailing list
> kde-games-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kde-games-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-games-devel/attachments/20120602/994a145a/attachment-0001.html>