/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-02 17:29:50 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100202172950-eh5ize8azzf0ril3
Don't use rest syntax for text displayed as-is to users.

* bzrlib/help_topics/en/conflict-types.txt: 
Despite apparences, this is displayed as is to the user and should
*not* use any fancy rest syntax (and that means no comments
either).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
1
 
# Copyright (C) 2005, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
695
695
    format = "Conflict: %(path)s is not a directory, but has files in it."\
696
696
             "  %(action)s."
697
697
 
 
698
    # FIXME: .OTHER should be used instead of .new when the conflict is created
 
699
 
698
700
    def take_this(self, tree):
699
701
        # FIXME: we should preserve that path when the conflict is generated !
700
702
        if self.path.endswith('.new'):