Mercurial > hgbook

comparison en/ch03-concepts.xml @ 771:b338f5490029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Americanize spellings :-(
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 09 Apr 2009 22:52:16 -0700
parents e9ef075327c1
children 29f0f79cf614
comparison
equal deleted inserted replaced
770:eb11ec9eed8c 771:b338f5490029
15 scenes gives me confidence that Mercurial has been carefully 15 scenes gives me confidence that Mercurial has been carefully
16 designed to be both <emphasis>safe</emphasis> and 16 designed to be both <emphasis>safe</emphasis> and
17 <emphasis>efficient</emphasis>. And just as importantly, if it's 17 <emphasis>efficient</emphasis>. And just as importantly, if it's
18 easy for me to retain a good idea of what the software is doing 18 easy for me to retain a good idea of what the software is doing
19 when I perform a revision control task, I'm less likely to be 19 when I perform a revision control task, I'm less likely to be
20 surprised by its behaviour.</para> 20 surprised by its behavior.</para>
21 21
22 <para id="x_2ea">In this chapter, we'll initially cover the core concepts 22 <para id="x_2ea">In this chapter, we'll initially cover the core concepts
23 behind Mercurial's design, then continue to discuss some of the 23 behind Mercurial's design, then continue to discuss some of the
24 interesting details of its implementation.</para> 24 interesting details of its implementation.</para>
25 25
442 quotes because all that you need to do to rectify this 442 quotes because all that you need to do to rectify this
443 situation is <command role="hg-cmd">hg merge</command>, then 443 situation is <command role="hg-cmd">hg merge</command>, then
444 <command role="hg-cmd">hg commit</command>. In other words, 444 <command role="hg-cmd">hg commit</command>. In other words,
445 this almost never has negative consequences; it's just 445 this almost never has negative consequences; it's just
446 something of a surprise for newcomers. I'll discuss other 446 something of a surprise for newcomers. I'll discuss other
447 ways to avoid this behaviour, and why Mercurial behaves in 447 ways to avoid this behavior, and why Mercurial behaves in
448 this initially surprising way, later on.</para> 448 this initially surprising way, later on.</para>
449 </note> 449 </note>
450 450
451 </sect2> 451 </sect2>
452 <sect2> 452 <sect2>