← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
302
302
    def test_commit_a_text_merge_in_a_checkout(self):
303
303
        # checkouts perform multiple actions in a transaction across bond
304
304
        # branches and their master, and have been observed to fail in the
305
 
        # past. This is a user story reported to fail in bug #43959 where 
 
305
        # past. This is a user story reported to fail in bug #43959 where
306
306
        # a merge done in a checkout (using the update command) failed to
307
307
        # commit correctly.
308
308
        trunk = self.make_branch_and_tree('trunk')