diff options
| author | smh22@uridium.cl.cam.ac.uk <smh22@uridium.cl.cam.ac.uk> | 2002-12-03 11:59:12 +0000 |
|---|---|---|
| committer | smh22@uridium.cl.cam.ac.uk <smh22@uridium.cl.cam.ac.uk> | 2002-12-03 11:59:12 +0000 |
| commit | 2187713f7d09e7c404244d9ef4f8a247a3b7eac8 (patch) | |
| tree | 5f519d05b1e0b66b69d398beaf3e4f5fb09aa580 | |
| parent | 73db0f0b5eac809ace72fa597f7b99497d774706 (diff) | |
| download | xen-2187713f7d09e7c404244d9ef4f8a247a3b7eac8.tar.gz xen-2187713f7d09e7c404244d9ef4f8a247a3b7eac8.tar.bz2 xen-2187713f7d09e7c404244d9ef4f8a247a3b7eac8.zip | |
bitkeeper revision 1.8 (3dec9c90XyJIr99XUErie7A1ZB6G4Q)
Merge uridium.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into uridium.cl.cam.ac.uk:/anfs/scratch/boulderdash/smh22/xeno.bk
| -rwxr-xr-x | .bk-to-hg | 4 | ||||
| -rwxr-xr-x | .hg-to-bk | 5 | ||||
| -rw-r--r-- | .rootkeys | 2 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
4 files changed, 5 insertions, 7 deletions
@@ -1,6 +1,6 @@ #!/bin/sh -x set -e -test -L xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs -rm xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs +test -L foo +rm foo (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 @@ -1,8 +1,5 @@ #!/bin/sh -x set -e -mkdir -p xenolinux-2.4.16-sparse -mkdir -p xenolinux-2.4.16-sparse/include -mkdir -p xenolinux-2.4.16-sparse/include/asm-xeno -ln -s ../../../xen-2.4.16/include/hypervisor-ifs/ xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs +ln -s ../../../xen-2.4.16/include/hypervisor-ifs/ foo (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 @@ -1,6 +1,7 @@ 3ddb6b0bKlMz_dz-M59a1mkUa1lASw BitKeeper/etc/config 3ddb6b0buTaC5zg1_a8FoAR9FWi_mw BitKeeper/etc/ignore 3ddb79c9_hgSp-gsQm8HqWM_9W3B_A BitKeeper/etc/logging_ok +3deb3f5bhXnxocVMiXaeZ0L7fQBGaw foo 3ddb79bcbOVHh38VJzc97-JEGD4dJQ xen-2.4.16/Makefile 3ddb79bcCa2VbsMp7mWKlhgwLQUQGA xen-2.4.16/README 3ddb79bcWnTwYsQRWl_PaneJfa6p0w xen-2.4.16/Rules.mk @@ -316,7 +317,6 @@ 3ddb79batzR40ZFY9dvgs5f1aM9I6g xenolinux-2.4.16-sparse/include/asm-xeno/hdreg.h 3ddb79b90xBgbeYgCcImS2ZxJakxBA xenolinux-2.4.16-sparse/include/asm-xeno/highmem.h 3ddb79baXLZV3dUKQI2gIYpAy67RuA xenolinux-2.4.16-sparse/include/asm-xeno/hw_irq.h -3deb3f5bhXnxocVMiXaeZ0L7fQBGaw xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs 3ddb79bapQ9Z9ewa5O1pqAVaNBTazg xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor.h 3ddb79baL-pjPI8hg5xjPgd4__SlOA xenolinux-2.4.16-sparse/include/asm-xeno/i387.h 3ddb79ba66TwvG7HpbBo04fRhmj3KQ xenolinux-2.4.16-sparse/include/asm-xeno/ide.h diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 825b553426..f7137dd8c5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,3 +2,4 @@ akw27@boulderdash.cl.cam.ac.uk kaf24@plym.cl.cam.ac.uk kaf24@striker.cl.cam.ac.uk smh22@boulderdash.cl.cam.ac.uk +smh22@uridium.cl.cam.ac.uk |