什么是被子补丁套装?

发布于 2024-07-16 19:32:06 字数 250 浏览 7 评论 0原文

有一个名为 git-quiltimport 的 git 命令。 它的手册页说它“将 quilt 补丁集应用到当前 git 分支上,保留 quilt 补丁集中存在的补丁边界、补丁顺序和补丁描述。”

但是,它没有定义什么是“被子补丁集”。 什么是“被子补丁集”?

There is a git command called git-quiltimport. Its man pages says it "Applies a quilt patchset onto the current git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset."

However, it doesn't define what a "quilt patchset" is. What is a "quilt patchset"?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(5

巴黎夜雨 2024-07-23 19:32:06

Quilt 是一个补丁管理工具。 这个想法是,它使您可以更轻松地在单个源客户端中维护多个离散的更改集,即使它们涉及相同的文件。

官方网站的细节很少,但如果您正在考虑使用它,那么值得一看。

如果您不使用 quilt,您可能只需要创建另一个客户端来维护单独的更改集,但您必须来回修补更改,这将使两个客户端源代码树受益。

Quilt is a patch managing tool. The idea is that it makes it easier for you to maintain multiple, discrete sets of changes in a single source client, even if they touch the same files.

The official site is sparse on details, but worth if you are thinking of using it.

If you didn't use quilt, you would probably just have to create another client to maintain the separate change sets, but you would have to patch back and forth changes that would benefit both client source trees.

翻身的咸鱼 2024-07-23 19:32:06

quilt 补丁集是一个特殊的补丁系列,设计用于与 Quilt 工具包一起使用。

被子

Quilt本质上是一个补丁管理工具包。 与git的不同之处
是它没有永久的历史:补丁本身可以有一个de-
描述字段通常相当于 git 中的提交元数据。 在哪里
quilt 与 git 的不同之处在于补丁集的锚定(quilt 只是
提取的源代码库之上的一系列补丁,没有任何明确的内容
正在修补的实际源库的标识)。

Git、Quilt 和其他内核维护工具 (PDF)

A quilt patchset is a special patch series designed for use with the Quilt toolkit.

Quilt

Quilt is essentially a patch management toolkit. Where it differs from git
is that it has no permanent history: The patches themselves can have a de-
scription field which usually equates to the commit meta-data in git. Where
quilt differs from git is in the anchoring of the patch set (quilt is simply
a series of patches above an extracted source base, without any definitive
identification of the actual source base being patched).

Git, Quilt and Other Kernel Maintenance Tools (PDF)

伴梦长久 2024-07-23 19:32:06

quilt 补丁集是由 quilt 管理和组合的一组补丁。

补丁集是一组可以应用于一组文件的补丁 - 这些文件可能是代码、文档、数据或其他任何内容,通常是某种类型的文本。 实际的补丁是一个文本文件,它定义了为创建新版本而对原始版本进行的更改,通常是使用程序“diff”生成的。 补丁集是这些 diff 输出的集合,每个输出通常是更改过程中的逻辑步骤。

Quilt 是一个可以管理大量文件上的多个补丁的程序。 它可用于创建补丁文件、选择要应用的补丁文件、导出这些补丁供其他人使用以及从其他地方导入补丁。

有关使用 patch 和 diff 的更多信息,请查看此处:
差异和修补十分钟指南

对于 quilt信息,尝试这些:
被子,补丁管理系统
quilt 手册页,以及
被子项目页面

A quilt patchset is a set of patches that were managed and put together by quilt.

A patchset is a group of patches that can be applied to a set of files - these files may be code, documention, data, or whatever, usually text of some sort. The actual patch is a text file that defines the changes to be made from the original to create the new version, usually generated by using the program 'diff'. The patchset is a collections of those diff outputs, each is usually a logical step in the change process.

Quilt is a program that can manage many patches over large set of files. It can be used to create the patch files, to select which patch files to be applied, to export those patches for others to use, and to import patches from elsewhere.

For more info on using patch and diff, check here:
The Ten Minute Guide to diff and patch

For quilt info, try these:
Quilt, a patch management system,
quilt manpage, and the
Quilt project page

瞳孔里扚悲伤 2024-07-23 19:32:06

Quilt 是一个非常轻量级的 SCM 工具,如 Git、Subversion 或 Mercurial。 quiltimport 可让您从 Quilt 导入到 Git。

很少有人用被子。 除非您有遗留的 Quilt 补丁,否则您可能不需要 quiltimport。 具体来说,如果您对 Git 感到满意,就没有理由采用 Quilt。

(Quilt 文档中的 quilt.pdf 建议,如果您不想支付更重量级版本控制系统的“开销”,而您只需要其功能的一小部分,那么您可能更喜欢 Quilt。)

Quilt is a very lightweight SCM tool, like Git, Subversion, or Mercurial. quiltimport lets you import from Quilt into Git.

Very few people use Quilt. Unless you have legacy Quilt patches lying around, you probably have no need for quiltimport. Specifically, if you're happy with Git, there's no reason to adopt Quilt.

(The quilt.pdf in Quilt's docs suggest you might prefer Quilt if you don't want to pay the "overhead" of a more heavyweight version control system when you only need a small fraction of its functionality.)

预谋 2024-07-23 19:32:06

如果您将补丁集视为要应用的补丁集,那么 git 2.7 将更好地将补丁集(包含补丁的文件夹)与文件“系列”(提供补丁的有序列表的文件)区分开来。申请)。

请参阅 Juerg Haefliger 的提交 ff60ffd(2015 年 8 月 31 日)。

(由 Junio C Hamano -- gitster -- 合并于 提交 db9789a,2015 年 10 月 5 日)

git-quiltimport:添加命令行选项--series

被子系列文件不必位于同一目录
与补丁一起使用,并且也可以使用与“系列”不同的名称。
该补丁添加了一个命令行选项以允许非标准系列
文件名和位置。

新选项是:

--series <file>:

被子系列文件。

系列文件的默认值为 /series 或 $QUILT_SERIES 环境变量的值。


注意:Git 2.21(2019 年第一季度)添加了“--keep-non-patch”选项。
请参阅 提交 1eadaa3(2018 年 12 月 12 日),作者:劳拉·阿博特 (labbott)
(由 Junio C Hamano -- gitster -- 合并于 提交 9c51ad5,2019 年 1 月 18 日)

git am 具有 --keep-non-patch 选项来传递 -bgi mailinfo 保持主题前缀完整
也允许将此选项与 quiltimport 一起使用。


If you consider a patch set as a set of patches to be applied, git 2.7 will do a better job to distinguish the patch set (a folder with patches) from the file 'series' (a file that gives an ordered list of patches to apply).

See commit ff60ffd (31 Aug 2015) by Juerg Haefliger.

(Merged by Junio C Hamano -- gitster -- in commit db9789a, 05 Oct 2015)

git-quiltimport: add commandline option --series <file>

The quilt series file doesn't have to be located in the same directory
with the patches and can be named differently than 'series' as well.
This patch adds a commandline option to allow for a non-standard series
filename and location.

The new option is:

--series <file>:

The quilt series file.

The default for the series file is <patches>/series or the value of the $QUILT_SERIES environment variable.


Note: with Git 2.21 (Q1 2019) adds "--keep-non-patch" option.
See commit 1eadaa3 (12 Dec 2018) by Laura Abbott (labbott).
(Merged by Junio C Hamano -- gitster -- in commit 9c51ad5, 18 Jan 2019)

git am has the --keep-non-patch option to pass -b to gi mailinfo for keeping subject prefixes intact.
Allow this option to be used with quiltimport as well.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文