ia64/xen-unstable

changeset 5690:32fb371cc283

manual merge
author iap10@freefall.cl.cam.ac.uk
date Wed Jul 06 18:57:54 2005 +0000 (2005-07-06)
parents 1c119c875f21 b237f032cee1
children 88c2d410979f
files .hgignore buildconfigs/mk.linux-2.6-xen docs/misc/hg-cheatsheet.txt extras/mini-os/Makefile extras/mini-os/events.c extras/mini-os/hypervisor.c extras/mini-os/include/events.h extras/mini-os/include/hypervisor.h extras/mini-os/include/lib.h extras/mini-os/include/mm.h extras/mini-os/include/os.h extras/mini-os/include/time.h extras/mini-os/include/traps.h extras/mini-os/include/types.h extras/mini-os/kernel.c extras/mini-os/time.c extras/mini-os/traps.c extras/mini-os/x86_32.S linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c patches/linux-2.6.11/smp-alts.patch tools/libxc/xc_linux_build.c xen/Makefile
line diff
     3.1 --- a/docs/misc/hg-cheatsheet.txt	Wed Jul 06 18:56:55 2005 +0000
     3.2 +++ b/docs/misc/hg-cheatsheet.txt	Wed Jul 06 18:57:54 2005 +0000
     3.3 @@ -96,6 +96,8 @@ repository from:
     3.4   
     3.5    http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-unstable.hg.tar.gz
     3.6  
     3.7 +  (or copy from /usr/groups/netos/html/xen/downloads/xen-unstable.hg.tar.gz)
     3.8 +
     3.9  Untar the repository on your disk, cd into it, and then pull the most
    3.10  recent changes:
    3.11  
    3.12 @@ -430,4 +432,7 @@ Show the parents of a changeset:
    3.13   you have two parents.  Otherwise, the single parent is the changeset
    3.14   which you most recently checked out.
    3.15  
    3.16 +Show the revision history for a single file
    3.17  
    3.18 +   hg [-v] log <filename>
    3.19 +