From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Stone Subject: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up Date: Fri, 11 Aug 2006 10:23:46 -0600 Message-ID: <1155313426.19157.31.camel@deimos> Reply-To: ahs3@fc.hp.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-jVXgMdGdspLJUm/EcT4v" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org --=-jVXgMdGdspLJUm/EcT4v Content-Type: text/plain Content-Transfer-Encoding: 7bit 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 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@fc.hp.com ahs3@debian.org ---------------------------------------------------------------------- --=-jVXgMdGdspLJUm/EcT4v Content-Disposition: attachment; filename=ia64-missing-files.bundle Content-Type: application/octet-stream; name=ia64-missing-files.bundle Content-Transfer-Encoding: base64 SEcxMEJaaDkxQVkmU1l/9MzHAAAIf//8tkAGYpv/5fEyTBu/7//6pCMEEICQC8FTAYIwIwhwhDAB epIg0omSeKep6j1GT1PU0PSDI9RobU00A00AND1PKB6mjQbUZPSeo8UONDRo0GjQNAAAAAAyAAAA NAZAAYJUU2TQmjRoIBoABoDIAGgaABoADJoAAl/TuHwLQXb163U5VNoEJdbbUHMlGmJxkwJA70ps Kv6jRcTi16J0HsV7ZK8oGZqKW/0cjqhljrNODrdDRau2H7boHkBZ75mAYY7ntBADCkE0Ih6bCLPZ 2WQvrqCTXUwp49N61BlN8hUaq4jpFajMFOKJjwbSxMCxUlwirGSBjYwjkkf6kNvwB0nhIQEaaGrk 00YIQEoXVQeKC0/7F9TOnXCpjnJ5u1CX4ieshae2pTBZ0ibkqix7gMg4TmB1bYeA3Uhl4QzQsnSZ CpHtAOPQ4kkbMUjzIqJ9YFEhcZQ+DSSrQCjPy67S3CQigdkbxTHmhSEzO0JNoycEAFG+aHyxWDdq sCEHxY4DmcGs7pD1uCQVEVIBQDHIYlcl3jztb1vyMsSTk245KCUDJZ+VfvywDhSCgBREuFwB9blU xHICcEHC/ZRL4qfJnYUKsMZpRxTEILYDcFReIp6kkUkVUuNQa8ZOR1yk/xdyRThQkH/0zMc= --=-jVXgMdGdspLJUm/EcT4v Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-jVXgMdGdspLJUm/EcT4v--