← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textmerge.py

(vila) Make all transport put_bytes() raises TypeError when given unicode
 strings rather than bytes (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textmerge.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
#
17
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
18
from bzrlib.textmerge import Merge2
26
26
    def test_conflict(self):
27
27
        lines_a = "a\nb\nc\nd\ne\nf\ng\nh\n".splitlines(True)
28
28
        lines_b = "z\nb\nx\nd\ne\ne\nf\ng\ny\n".splitlines(True)
29
 
        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\n<\n=\ne\n>\ne\nf\n"\
 
29
        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\ne\n<\n=\ne\n>\nf\n"\
30
30
                   "g\n<\nh\n=\ny\n>\n"
31
31
        m2 = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n')
32
32
        mlines= m2.merge_lines()[0]