/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_update.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-02 19:50:18 UTC
  • mfrom: (5071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5072.
  • Revision ID: jelmer@samba.org-20100302195018-x2rz29tcs77k4v67
merge bzr.dev.

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
341
340
        # now update (and get conflicts)
342
341
        out, err = self.run_bzr('update lightweight', retcode=1)
343
342
        self.assertEqual('', out)
 
343
        # NB: these conflicts are actually in the source code
344
344
        self.assertFileEqual('''\
345
345
<<<<<<< TREE
346
346
lightweight local changes
358
358
        # check we get the second conflict
359
359
        out, err = self.run_bzr('update lightweight', retcode=1)
360
360
        self.assertEqual('', out)
 
361
        # NB: these conflicts are actually in the source code
361
362
        self.assertFileEqual('''\
362
363
<<<<<<< TREE
363
364
lightweight+checkout
366
367
>>>>>>> MERGE-SOURCE
367
368
''',
368
369
                             'lightweight/file')
369