← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_update.py

  • Committer: Ian Clatworthy
  • Date: 2010-03-30 20:13:52 UTC
  • mto: This revision was merged to the branch mainline in revision 5125.
  • Revision ID: ian.clatworthy@canonical.com-20100330201352-vw2gtujybyg3rvwc
whitespace fix in win32 installer

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
1
1
# Copyright (C) 2006-2010 Canonical Ltd
2
 
# -*- coding: utf-8 -*-
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
196
195
 
197
196
        self.build_tree(['checkout1/'])
198
197
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
199
 
        branch.BranchReferenceFormat().initialize(checkout_dir, master.branch)
 
198
        branch.BranchReferenceFormat().initialize(checkout_dir,
 
199
            target_branch=master.branch)
200
200
        checkout1 = checkout_dir.create_workingtree('m1')
201
201
 
202
202
        # Create a second branch, with an extra commit
341
341
        # now update (and get conflicts)
342
342
        out, err = self.run_bzr('update lightweight', retcode=1)
343
343
        self.assertEqual('', out)
 
344
        # NB: these conflicts are actually in the source code
344
345
        self.assertFileEqual('''\
345
346
<<<<<<< TREE
346
347
lightweight local changes
358
359
        # check we get the second conflict
359
360
        out, err = self.run_bzr('update lightweight', retcode=1)
360
361
        self.assertEqual('', out)
 
362
        # NB: these conflicts are actually in the source code
361
363
        self.assertFileEqual('''\
362
364
<<<<<<< TREE
363
365
lightweight+checkout
366
368
>>>>>>> MERGE-SOURCE
367
369
''',
368
370
                             'lightweight/file')
369