← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Ian Clatworthy
  • Date: 2008-04-01 04:19:06 UTC
  • mfrom: (3302.6.1 xma-mailmode)
  • mto: This revision was merged to the branch mainline in revision 3323.
  • Revision ID: ian.clatworthy@canonical.com-20080401041906-s7ekpfpo0tnyfkbz
Add mail-mode GNU Emacs mail package as a mail client option (Xavier Maillard)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
45
45
# u'\xe5' == a with circle
46
46
# '\xc3\xae' == u'\xee' == i with hat
47
47
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
48
 
example_conflicts = ConflictList([
 
48
example_conflicts = ConflictList([ 
49
49
    MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
50
 
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
 
50
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'), 
51
51
    TextConflict(u'p\xe5tha'),
52
52
    PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
53
53
    DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',
85
85
        restore('hello.sploo')
86
86
        self.assertEqual(len(tree.conflicts()), 0)
87
87
        self.assertFileEqual('hello world2', 'hello')
88
 
        self.assertFalse(os.path.lexists('hello.sploo'))
 
88
        assert not os.path.lexists('hello.sploo')
89
89
        self.assertRaises(NotConflicted, restore, 'hello')
90
90
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
91
91