From: Al Stone <ahs3@fc.hp.com>
To: xen-devel <xen-devel@lists.xensource.com>
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 [thread overview]
Message-ID: <1155313426.19157.31.camel@deimos> (raw)
[-- 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
next reply other threads:[~2006-08-11 16:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-11 16:23 Al Stone [this message]
2006-08-11 16:26 ` [PATCH BUNDLE] add back in ia64 files that the last merge did not pick up Keir Fraser
2006-08-11 16:37 ` Al Stone
2006-08-11 16:42 ` Keir Fraser
2006-08-11 16:48 ` Al Stone
2006-08-11 16:27 ` Al Stone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1155313426.19157.31.camel@deimos \
--to=ahs3@fc.hp.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.