Re: [Xen-devel] [PATCH v3 0/8] Split off mini-os to a separate tree

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> This is v3 of my mini-os splitting off patch series.

As xen@xenbits I ran:
        $ mkdir ~/git/mini-os.git
        $ cd ~/git/mini-os.git
        $ git init --bare
        Initialized empty Git repository in /home/xen/git/mini-os.git/
        $ chgrp -R xenmaint .
        $ find . -type d -exec chmod g+s {} \;
        $ git config --add receive.denyNonFastForwards true
        $ git config --add receive.unpackLimit 10000
        $ git config --add gc.autopacklimit 25

(the last three are due to what is in xen.git/config)

Then on the machine where I usually do committing stuff I did:
        $ git clone git://xenbits.xen.org/mini-os.git mini-os.git
        Cloning into 'mini-os.git'...
        warning: You appear to have cloned an empty repository.
        $ git fetch git://xenbits.xen.org/people/liuw/mini-os.git master
        remote: Counting objects: 3325, done.
        remote: Compressing objects: 100% (954/954), done.
        remote: Total 3325 (delta 2308), reused 3291 (delta 2282)
        Receiving objects: 100% (3325/3325), 962.22 KiB | 451 KiB/s, done.
        Resolving deltas: 100% (2308/2308), done.
        From git://xenbits.xen.org/people/liuw/mini-os
         * branch            master     -> FETCH_HEAD
        $ git push --dry-run origin 
f5d9868796e91bee70601805b9bfc1bb544b0586:refs/heads/master
        To ssh://xenbits.xen.org/home/xen/git/mini-os.git
         * [new branch]      f5d9868796e91bee70601805b9bfc1bb544b0586 -> master

However having merged wip.build-system-v4 I discovered that autogen.sh
needed to have been run half way up the merged branch.

Wei fixed this up and produced a new people/liuw/mini-os.git and
wip.build-system-v5, see <20150227161058.GE29195@xxxxxxxxxxxxxxxxxxxxx>.

So in mini-os.git:

        $ git fetch git://xenbits.xen.org/people/liuw/mini-os.git master
        remote: Counting objects: 99, done.
        remote: Compressing objects: 100% (71/71), done.
        remote: Total 90 (delta 19), reused 84 (delta 15)
        Unpacking objects: 100% (90/90), done.
        From git://xenbits.xen.org/people/liuw/mini-os
         * branch            master     -> FETCH_HEAD
        $ git rev-parse FETCH_HEAD
        55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d
        $ git push --dry-run origin 
+55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d:refs/heads/master
        To ssh://xenbits.xen.org/home/xen/git/mini-os.git
         + f5d9868...55f7cd7 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -> master 
(forced update)
        $ git push origin 
+55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d:refs/heads/master
        Counting objects: 99, done.
        Delta compression using up to 8 threads.
        Compressing objects: 100% (70/70), done.
        Writing objects: 100% (90/90), 183.78 KiB, done.
        Total 90 (delta 19), reused 86 (delta 16)
        To ssh://xenbits.xen.org/home/xen/git/mini-os.git
         + f5d9868...55f7cd7 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -> master 
(forced update)
        
This required me to temporarily disable receive.denyNonFastForward on
the xenbits repo. It is re-enabled now.

Having done that I pulled

 git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v5

into my staging branch, build tested it and pushed it back out to the
xen.git#staging branch.

Phew!

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel