comparison en/ch11-mq.xml @ 771:b338f5490029

Americanize spellings :-(
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 09 Apr 2009 22:52:16 -0700
parents 1c13ed2130a7
children 3b640272a966
comparison
equal deleted inserted replaced
770:eb11ec9eed8c 771:b338f5490029
64 <sect1 id="sec:mq:history"> 64 <sect1 id="sec:mq:history">
65 <title>The prehistory of Mercurial Queues</title> 65 <title>The prehistory of Mercurial Queues</title>
66 66
67 <para id="x_3b3">During the late 1990s, several Linux kernel developers 67 <para id="x_3b3">During the late 1990s, several Linux kernel developers
68 started to maintain <quote>patch series</quote> that modified 68 started to maintain <quote>patch series</quote> that modified
69 the behaviour of the Linux kernel. Some of these series were 69 the behavior of the Linux kernel. Some of these series were
70 focused on stability, some on feature coverage, and others were 70 focused on stability, some on feature coverage, and others were
71 more speculative.</para> 71 more speculative.</para>
72 72
73 <para id="x_3b4">The sizes of these patch series grew rapidly. In 2002, 73 <para id="x_3b4">The sizes of these patch series grew rapidly. In 2002,
74 Andrew Morton published some shell scripts he had been using to 74 Andrew Morton published some shell scripts he had been using to
123 <sect2 id="sec:mq:quilt-mq"> 123 <sect2 id="sec:mq:quilt-mq">
124 <title>From patchwork quilt to Mercurial Queues</title> 124 <title>From patchwork quilt to Mercurial Queues</title>
125 125
126 <para id="x_3ba">In mid-2005, Chris Mason took the features of quilt and 126 <para id="x_3ba">In mid-2005, Chris Mason took the features of quilt and
127 wrote an extension that he called Mercurial Queues, which 127 wrote an extension that he called Mercurial Queues, which
128 added quilt-like behaviour to Mercurial.</para> 128 added quilt-like behavior to Mercurial.</para>
129 129
130 <para id="x_3bb">The key difference between quilt and MQ is that quilt 130 <para id="x_3bb">The key difference between quilt and MQ is that quilt
131 knows nothing about revision control systems, while MQ is 131 knows nothing about revision control systems, while MQ is
132 <emphasis>integrated</emphasis> into Mercurial. Each patch 132 <emphasis>integrated</emphasis> into Mercurial. Each patch
133 that you push is represented as a Mercurial changeset. Pop a 133 that you push is represented as a Mercurial changeset. Pop a