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
1=== modified file 'bzrlib/help_topics/en/eol.txt'
2--- bzrlib/help_topics/en/eol.txt 2009-04-02 04:12:11 +0000
3+++ bzrlib/help_topics/en/eol.txt 2009-05-13 07:35:23 +0000
4@@ -14,17 +14,17 @@
5 To configure which files to filter, set ``eol`` to one of the values below.
6 (If a value is not set, ``exact`` is the default.)
7
8- ============== ============================== ======================
9- Value Checkout end-of-lines as Commit end-of-lines as
10- ============== ============================== ======================
11- native crlf on Windows, lf otherwise lf
12- -------------- ------------------------------ ----------------------
13- lf lf lf
14- -------------- ------------------------------ ----------------------
15- crlf crlf lf
16- -------------- ------------------------------ ----------------------
17- exact No conversion exactly as in file
18- ============== ============================== ======================
19+ ========== ===================================== ======================
20+ Value Checkout end-of-lines as Commit end-of-lines as
21+ ========== ===================================== ======================
22+ ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``
23+ ---------- ------------------------------------- ----------------------
24+ ``lf`` ``lf`` ``lf``
25+ ---------- ------------------------------------- ----------------------
26+ ``crlf`` ``crlf`` ``lf``
27+ ---------- ------------------------------------- ----------------------
28+ ``exact`` No conversion Exactly as in file
29+ ========== ===================================== ======================
30
31 Note: For safety reasons, no conversion is applied to any file where a null
32 byte is detected in the file.
33@@ -82,20 +82,21 @@
34 supported yet.)
35
36 If you have an existing repository with text files already stored using
37-Windows newline conventions (crlf), then you may want to keep using that
38+Windows newline conventions (``crlf``), then you may want to keep using that
39 convention in the repository. Forcing certain files to this convention
40 may also help users who do not have rules configured. To do this, set
41 ``eol`` to one of the values below.
42
43- ========================= ============================== ======================
44- Value Checkout end-of-lines as Commit end-of-lines as
45- ========================= ============================== ======================
46- native-with-crlf-in-repo crlf on Windows, lf otherwise crlf
47- ------------------------- ------------------------------ ----------------------
48- lf-with-crlf-in-repo lf crlf
49- ------------------------- ------------------------------ ----------------------
50- crlf-with-crlf-in-repo crlf crlf
51- ========================= ============================== ======================
52+ ============================ ======================== ======================
53+ Value Checkout end-of-lines as Commit end-of-lines as
54+ ============================ ======================== ======================
55+ ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``
56+ ``lf`` otherwise
57+ ---------------------------- ------------------------ ----------------------
58+ ``lf-with-crlf-in-repo`` ``lf`` ``crlf``
59+ ---------------------------- ------------------------ ----------------------
60+ ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``
61+ ============================ ======================== ======================
62
63 For users working on an existing project that uses Windows newline
64 conventions in their Bazaar repository, this rule is suggested as a
65@@ -104,7 +105,7 @@
66 [name *]
67 eol = native-with-crlf-in-repo
68
69-For new projects, it is recommended that end-of-lines be stored as lf
70+For new projects, it is recommended that end-of-lines be stored as ``lf``
71 and that users stick to the basic settings, i.e. ``native``, ``lf``,
72 ``crlf`` and ``exact``.
73