add back in ia64 files that the last merge did not pick up
PATCH 1/1 add back in ia64 files that the last merge did not pick up
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.
References:
[1] See discussion thread on this topic at
http://www.selenic.com/pipermail/mercurial/2006-January/006267.html
Signature · 8 lines
Ciao, al ---------------------------------------------------------------------- Al Stone Alter Ego: Open Source and Linux R&D Debian Developer Hewlett-Packard Company http://www.debian.org E-mail: [email protected] [email protected] ----------------------------------------------------------------------
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 5 lines · Al Stone
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.
Put '/* This file intentionally left blank. */' in each file?
-- Keir
Quoted 9 lines · Keir Fraser
Quoted 5 lines · Al Stone
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.
Put '/* This file intentionally left blank. */' in each file?
Bother. Leave it to me to miss the bl**dy obvious.
I can redo this, or note it for future reference, whichever you prefer....
Signature · 8 lines
Ciao, al ---------------------------------------------------------------------- Al Stone Alter Ego: Open Source and Linux R&D Debian Developer Hewlett-Packard Company http://www.debian.org E-mail: [email protected] [email protected] ----------------------------------------------------------------------
Quoted 6 lines · Al Stone
Quoted 1 line
Put '/* This file intentionally left blank. */' in each file?
Bother. Leave it to me to miss the bl**dy obvious.
I can redo this, or note it for future reference, whichever you prefer....
It's a simple script so I'll apply something appropriate to current contents of linux-null. Then any files added in future can follow suit.
Another option is to get rid of those files from the repo altogether and dynamically create them as part of the build process. Maybe that'd be a bit of a pain though.
-- Keir
Quoted 11 lines · Keir Fraser
Quoted 6 lines · Al Stone
Quoted 1 line
Put '/* This file intentionally left blank. */' in each file?
Bother. Leave it to me to miss the bl**dy obvious.
I can redo this, or note it for future reference, whichever you prefer....
It's a simple script so I'll apply something appropriate to current contents of linux-null. Then any files added in future can follow suit.
Thanks.
Quoted 3 lines
Another option is to get rid of those files from the repo altogether and dynamically create them as part of the build process. Maybe that'd be a bit of a pain though.
I'll investigate.
Signature · 8 lines
Ciao, al ---------------------------------------------------------------------- Al Stone Alter Ego: Open Source and Linux R&D Debian Developer Hewlett-Packard Company http://www.debian.org E-mail: [email protected] [email protected] ----------------------------------------------------------------------
Quoted 5 lines · Al Stone
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.hxen/include/asm-ia64/linux-null/linux/workqueue.h
Sorry -- I forgot to mention that this is a problem because without these files, the ia64 Xen build fails to compile.
Signature · 8 lines
Ciao, al ---------------------------------------------------------------------- Al Stone Alter Ego: Open Source and Linux R&D Debian Developer Hewlett-Packard Company http://www.debian.org E-mail: [email protected] [email protected] ----------------------------------------------------------------------