Re: xen.git branch reorg

[William Pitcock <nenolod@dereferenced.org>]

Cloning git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
gives me the following:

nenolod@petrie:~/dev-src$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git linux-xen-next
Initialized empty Git repository in /home/nenolod/dev-src/linux-xen-next/.git/
remote: Counting objects: 1299853, done.
remote: Compressing objects: 100% (227847/227847), done.
remote: Total 1299853 (delta 1088065), reused 1275536 (delta 1064482)
Receiving objects: 100% (1299853/1299853), 306.99 MiB | 411 KiB/s, done.
Resolving deltas: 100% (1088065/1088065), done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

Something seems wrong here.

William

On Thu, 2009-04-23 at 10:38 -0700, Jeremy Fitzhardinge wrote:
> I finally fixed the AHCI problem with xen-tip/next and pushed forward 
> with the long-threatened xen.git cleanup and reorg.
> 
> I've removed a pile of branches on 
> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git:
> 
>     * xen/*
>     * push2/*
>     * for-*/*
> 
> aside from some branches which contain some work which I need to look 
> over again and work out what to do with.
> 
> *PLEASE* tell me if I've accidentally deleted a branch with something 
> important, and I'll reinstate it.
> 
> All the changesets are still there in the repo, and if you have any 
> local branches referring to these branches then they'll stay around 
> indefinitely.  The removal just means that the branches won't confuse 
> any newcomers, and it makes it clear that no further development is 
> going to happen on them.
> 
> The new branch structure is similar to the old one in overall layout.  
> There are two "merged" branches:
> 
>     * xen-tip/master - will try to keep as a known-working branch, with
>       only tested changes
>     * xen-tip/next - current bleeding edge; should at least compile
> 
> My planned workflow is:
> 
>    1. new development happens on topic branches
>    2. those changes are merged with xen-tip/next until they test OK
>    3. the changes are then merged onto master (either directly off next,
>       or cleanly re-merged)
>    4. upstream branches are merged with next and master like topic
>       branches; I'll avoid merging them into xen.git topic branches
>       unless its really necessary
> 
> I won't generally rebase any of the branches, though the "next" and 
> "master" are more likely to be rebased than the topic branches.
> 
> The current set of topic branches are:
> 
>     * xen-tip/core
>           o core Xen stuff; currently all upstream
>     * xen-tip/dom0/acpi
>           o host S3 suspend/resume (untested, unmerged)
>     * xen-tip/dom0/apic
>           o apic changes
>     * xen-tip/dom0/backend/core
>     * xen-tip/dom0/backend/blkback
>     * xen-tip/dom0/backend/netback
>           o backend devices
>     * xen-tip/dom0/core
>           o essential dom0 changes
>     * xen-tip/dom0/drm
>           o drm/dri changes
>     * xen-tip/dom0/gntdev
>           o /dev/gntdev
>     * xen-tip/dom0/microcode
>           o CPU microcode driver
>     * xen-tip/dom0/mtrr
>           o /proc/mtrr stuff
>     * xen-tip/dom0/pci
>           o general dom0 PCI/device access changes
>     * xen-tip/dom0/swiotlb
>           o Xen swiotlb changes
>     * xen-tip/dom0/xenfs
>           o /proc/xen/privcmd
> 
> 
> Thanks,
>     J
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel