Merge lp:~ian-clatworthy/bzr/better-eol-doc into lp:~bzr/bzr/trunk-old

Proposed by Ian Clatworthy on 2009-06-10
Status: Superseded
Proposed branch: lp:~ian-clatworthy/bzr/better-eol-doc
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 44 lines (has conflicts)
Text conflict in NEWS
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/better-eol-doc
Reviewer Review Type Date Requested Status
John A Meinel 2009-06-10 Needs Fixing on 2009-06-10
Review via email: mp+7273@code.launchpad.net

This proposal has been superseded by a proposal from 2009-06-11.

To post a comment you must log in.
Ian Clatworthy (ian-clatworthy) wrote :

This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.

John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/better-eol-doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.
>
>

I'm pretty sure you need:

bzr info -v

As plain 'bzr info' doesn't tell you the exact formats.

...

BZR_HOME/bazaar.conf

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkovwo8ACgkQJdeBCYSNAANlnACfUazYVeXaB7uJsm8mr1m59IVX
szUAoJvEGBZUm1ymcVf6WOOdCeYNw0TE
=hRwY
-----END PGP SIGNATURE-----

John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/better-eol-doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.
>
>

Sorry I hit send to early:

+Currently, rules are only supported in BZR_HOME/bazaar.conf. (Branch
+specific rules will be supported in a future verison of Bazaar.)

^- I'm pretty sure it is $BZR_HOME/rules not 'bazaar.conf'.

If I'm wrong, then you can land it.

  review needs_fixing

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkovwrcACgkQJdeBCYSNAAPY5QCfeGm8iP4vPn5KpxwVckKWQwpm
ifgAoILG8EJExtTmdDRHaopVMjGMIhgM
=iF+E
-----END PGP SIGNATURE-----

review: Needs Fixing
Ian Clatworthy (ian-clatworthy) wrote :

John A Meinel wrote:
> Review: Needs Fixing
>
> Sorry I hit send to early:
>
> +Currently, rules are only supported in BZR_HOME/bazaar.conf. (Branch
> +specific rules will be supported in a future verison of Bazaar.)
>
> ^- I'm pretty sure it is $BZR_HOME/rules not 'bazaar.conf'.
>
Oops. Right you are. (BTW, we usually leave the $ off the front as it's
wrong on Windows.) I'll fix and resubmit.

Ian C.

4425. By Ian Clatworthy on 2009-06-11

review tweaks from jam

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-06-10 09:34:02 +0000
3+++ NEWS 2009-06-10 15:35:23 +0000
4@@ -104,11 +104,17 @@
5 Documentation
6 *************
7
8+<<<<<<< TREE
9 * Added directory structure and started translation of docs in Russian.
10 (Alexey Shtokalo, Alexander Iljin, Alexander Belchenko, Dmitry Vasiliev,
11 Volodymyr Kotulskyi)
12
13
14+=======
15+* Minor clarifications to the help for End-Of-Line conversions.
16+ (Ian Clatworthy)
17+
18+>>>>>>> MERGE-SOURCE
19 API Changes
20 ***********
21
22
23=== modified file 'bzrlib/help_topics/en/eol.txt'
24--- bzrlib/help_topics/en/eol.txt 2009-05-12 02:01:15 +0000
25+++ bzrlib/help_topics/en/eol.txt 2009-06-10 15:35:23 +0000
26@@ -6,10 +6,16 @@
27 ``bzr help content-filters`` for general information about using these.
28
29 Note: Content filtering is only supported in recently added formats,
30-e.g. 1.14.
31+e.g. 1.14. Be sure that both the repository *and* the branch are
32+in a recent format. (Just setting the format on the repository
33+is not enough.) If content filtering does not appear to be working, use
34+'bzr info' to confirm that the branch is using "Working Tree format 5"
35+or later.
36
37-EOL conversion needs to be enabled for selected branches and files using
38+EOL conversion needs to be enabled for selected file patterns using
39 rules. See ``bzr help rules`` for general information on defining rules.
40+Currently, rules are only supported in BZR_HOME/bazaar.conf. (Branch
41+specific rules will be supported in a future verison of Bazaar.)
42
43 To configure which files to filter, set ``eol`` to one of the values below.
44 (If a value is not set, ``exact`` is the default.)