← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/configuration.txt

  • Committer: Patch Queue Manager
  • Date: 2012-10-11 06:51:37 UTC
  • mfrom: (6564.2.4 mergetool-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20121011065137-jwd2uopciwfm98g2
(vila) Clarify how `mergetool` templates should be used with `bzr config`.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/configuration.txt
713
713
 
714
714
  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
715
715
 
 
716
Because ``mergetool`` and ``config`` itself both use curly braces as
 
717
interpolation markers, trying to display the mergetool line results in the
 
718
following problem::
 
719
 
 
720
 
 
721
  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o {result}'
 
722
  $ bzr config bzr.mergetool.kdiff3
 
723
  bzr: ERROR: Option base is not defined while expanding "kdiff3 {base} {this} {other} -o {result}".
 
724
 
 
725
To avoid this, ``config`` can be instructed not to try expanding variables::
 
726
 
 
727
  $ bzr config --all bzr.mergetool.kdiff3
 
728
  branch:
 
729
    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
 
730
 
 
731
 
716
732
bzr.default_mergetool
717
733
~~~~~~~~~~~~~~~~~~~~~
718
734