← 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: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-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
174
174
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
175
175
 
176
176
 
 
177
# FIXME: The shell-like tests should be converted to real whitebox tests... or
 
178
# moved to a blackbox module -- vila 20100205
 
179
 
177
180
# FIXME: Tests missing for DuplicateID conflict type
178
181
class TestResolveConflicts(script.TestCaseWithTransportAndScript):
179
182