Merge lp:~gary-wilson/bzr/eol-doc into lp:~bzr/bzr/trunk-old

Proposed by Gary Wilson on 2009-05-12
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gary-wilson/bzr/eol-doc
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 72 lines
To merge this branch: bzr merge lp:~gary-wilson/bzr/eol-doc
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve on 2009-05-12
Robert Collins (community) 2009-05-12 Approve on 2009-05-12
Review via email: mp+6453@code.launchpad.net
To post a comment you must log in.
Gary Wilson (gary-wilson) wrote :

Edits to the EOL documentation to use inline literals for "lf" and "clrf" where not already being used.

Robert Collins (lifeless) wrote :

 review approve

review: Approve
Ian Clatworthy (ian-clatworthy) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/help_topics/en/eol.txt'
--- bzrlib/help_topics/en/eol.txt 2009-04-02 04:12:11 +0000
+++ bzrlib/help_topics/en/eol.txt 2009-05-13 07:35:23 +0000
@@ -14,17 +14,17 @@
14To configure which files to filter, set ``eol`` to one of the values below.14To configure which files to filter, set ``eol`` to one of the values below.
15(If a value is not set, ``exact`` is the default.)15(If a value is not set, ``exact`` is the default.)
1616
17 ============== ============================== ======================17 ========== ===================================== ======================
18 Value Checkout end-of-lines as Commit end-of-lines as18 Value Checkout end-of-lines as Commit end-of-lines as
19 ============== ============================== ======================19 ========== ===================================== ======================
20 native crlf on Windows, lf otherwise lf20 ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``
21 -------------- ------------------------------ ----------------------21 ---------- ------------------------------------- ----------------------
22 lf lf lf22 ``lf`` ``lf`` ``lf``
23 -------------- ------------------------------ ----------------------23 ---------- ------------------------------------- ----------------------
24 crlf crlf lf24 ``crlf`` ``crlf`` ``lf``
25 -------------- ------------------------------ ----------------------25 ---------- ------------------------------------- ----------------------
26 exact No conversion exactly as in file26 ``exact`` No conversion Exactly as in file
27 ============== ============================== ======================27 ========== ===================================== ======================
2828
29Note: For safety reasons, no conversion is applied to any file where a null29Note: For safety reasons, no conversion is applied to any file where a null
30byte is detected in the file.30byte is detected in the file.
@@ -82,20 +82,21 @@
82supported yet.)82supported yet.)
8383
84If you have an existing repository with text files already stored using84If you have an existing repository with text files already stored using
85Windows newline conventions (crlf), then you may want to keep using that85Windows newline conventions (``crlf``), then you may want to keep using that
86convention in the repository. Forcing certain files to this convention86convention in the repository. Forcing certain files to this convention
87may also help users who do not have rules configured. To do this, set87may also help users who do not have rules configured. To do this, set
88``eol`` to one of the values below.88``eol`` to one of the values below.
8989
90 ========================= ============================== ======================90 ============================ ======================== ======================
91 Value Checkout end-of-lines as Commit end-of-lines as91 Value Checkout end-of-lines as Commit end-of-lines as
92 ========================= ============================== ======================92 ============================ ======================== ======================
93 native-with-crlf-in-repo crlf on Windows, lf otherwise crlf93 ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``
94 ------------------------- ------------------------------ ----------------------94 ``lf`` otherwise
95 lf-with-crlf-in-repo lf crlf95 ---------------------------- ------------------------ ----------------------
96 ------------------------- ------------------------------ ----------------------96 ``lf-with-crlf-in-repo`` ``lf`` ``crlf``
97 crlf-with-crlf-in-repo crlf crlf97 ---------------------------- ------------------------ ----------------------
98 ========================= ============================== ======================98 ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``
99 ============================ ======================== ======================
99100
100For users working on an existing project that uses Windows newline101For users working on an existing project that uses Windows newline
101conventions in their Bazaar repository, this rule is suggested as a102conventions in their Bazaar repository, this rule is suggested as a
@@ -104,7 +105,7 @@
104 [name *]105 [name *]
105 eol = native-with-crlf-in-repo106 eol = native-with-crlf-in-repo
106107
107For new projects, it is recommended that end-of-lines be stored as lf108For new projects, it is recommended that end-of-lines be stored as ``lf``
108and that users stick to the basic settings, i.e. ``native``, ``lf``,109and that users stick to the basic settings, i.e. ``native``, ``lf``,
109``crlf`` and ``exact``.110``crlf`` and ``exact``.
110111