Rev 6569: (vila) Clarify how `mergetool` templates should be used with `bzr config`. in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6569 [merge]
revision-id: pqm at pqm.ubuntu.com-20121011065137-jwd2uopciwfm98g2
parent: pqm at pqm.ubuntu.com-20121010184521-wzqd4ei53vnrcdnc
parent: v.ladeuil+lp at free.fr-20121010182939-iv6e9wj26rp61nc2
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-10-11 06:51:37 +0000
message:
  (vila) Clarify how `mergetool` templates should be used with `bzr config`.
   (Vincent Ladeuil)
modified:
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2012-06-20 13:58:18 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2012-10-10 18:29:39 +0000
@@ -713,6 +713,22 @@
 
   bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
 
+Because ``mergetool`` and ``config`` itself both use curly braces as
+interpolation markers, trying to display the mergetool line results in the
+following problem::
+
+
+  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o {result}'
+  $ bzr config bzr.mergetool.kdiff3
+  bzr: ERROR: Option base is not defined while expanding "kdiff3 {base} {this} {other} -o {result}".
+
+To avoid this, ``config`` can be instructed not to try expanding variables::
+
+  $ bzr config --all bzr.mergetool.kdiff3
+  branch:
+    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
+
+
 bzr.default_mergetool
 ~~~~~~~~~~~~~~~~~~~~~