WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH BUNDLE] add back in ia64 files that the last merge di

To: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up
From: Al Stone <ahs3@xxxxxxxxx>
Date: Fri, 11 Aug 2006 10:23:46 -0600
Delivery-date: Fri, 11 Aug 2006 09:24:01 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: Hewlett-Packard
Reply-to: ahs3@xxxxxxxxx
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
During the last pull from xen-ia64-unstable.hg, two zero length files
were not brought into xen-unstable.hg:

   xen/include/asm-ia64/linux-null/linux/kallsyms.h
   xen/include/asm-ia64/linux-null/linux/workqueue.h

Since mercurial/diff cannot handle zero length files, 'hg diff' did
not report them so these got dropped [1].  So, attached is an 'hg
bundle' that will add them back in properly using 'hg unbundle'.  The
bundle is, unfortunately, a binary format.

It ain't pretty, but until diff handles zero length files, mercurial
can't handle them unless one uses bundles.  Or constantly pesters
Keir to add in zero length files -- not _my_ preferred option, nor
Keir's, I imagine :).  If there is some other way to handle this,
please let me know.

Signed-off-by: Al Stone <ahs3@xxxxxxxxx>

References:
[1]  See discussion thread on this topic at  
     http://www.selenic.com/pipermail/mercurial/2006-January/006267.html

-- 
Ciao,
al
----------------------------------------------------------------------
Al Stone                                      Alter Ego:
Open Source and Linux R&D                     Debian Developer
Hewlett-Packard Company                       http://www.debian.org
E-mail: ahs3@xxxxxxxxx                        ahs3@xxxxxxxxxx
----------------------------------------------------------------------

Attachment: ia64-missing-files.bundle
Description: Binary data

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel