[PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Al Stone]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

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@fc.hp.com>

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
----------------------------------------------------------------------

[-- Attachment #2: ia64-missing-files.bundle --]
[-- Type: application/octet-stream, Size: 509 bytes --]

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Keir Fraser]

On 11/8/06 5:23 pm, "Al Stone" <ahs3@fc.hp.com> wrote:

> 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

Re: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Al Stone]

On Fri, 2006-08-11 at 17:26 +0100, Keir Fraser wrote:
> On 11/8/06 5:23 pm, "Al Stone" <ahs3@fc.hp.com> wrote:
> 
> > 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....

-- 
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
----------------------------------------------------------------------

Re: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Keir Fraser]

On 11/8/06 5:37 pm, "Al Stone" <ahs3@fc.hp.com> wrote:

>> 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

Re: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Al Stone]

On Fri, 2006-08-11 at 17:42 +0100, Keir Fraser wrote:
> On 11/8/06 5:37 pm, "Al Stone" <ahs3@fc.hp.com> wrote:
> 
> >> 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.

> 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.

-- 
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
----------------------------------------------------------------------

Re: [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up

[Al Stone]

On Fri, 2006-08-11 at 10:23 -0600, Al Stone wrote:
> 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

Sorry -- I forgot to mention that this is a problem because without
these files, the ia64 Xen build fails to compile.

-- 
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
----------------------------------------------------------------------