/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/tests/blackbox/test_remerge.py

  • Committer: Aaron Bentley
  • Date: 2006-11-17 04:06:03 UTC
  • mfrom: (2139 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061117040603-pgebxndswvwk26tt
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
78
78
        self.failIfExists('question.OTHER')
79
79
 
80
80
        file_id = self.run_bzr('file-id', 'hello')[0]
81
 
        self.run_bzr_error(['\'hello.THIS\' is not a versioned file'],
 
81
        self.run_bzr_error(['hello.THIS is not versioned'],
82
82
                           'file-id', 'hello.THIS')
83
83
 
84
84
        self.run_bzr_error(['conflicts encountered'],