← Back to branch summary

~spiv/bzr/checkout-tags-propagation-603395-2.2

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-11-09 06:14:12 UTC
  • Revision ID: andrew.bennetts@canonical.com-20101109061412-oki2jym721pla0io
Add unit test for ignore_master=True, and improve other test comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_tags.py
135
135
    def test_merge_without_commit_does_not_propagate_tags_to_master(self):
136
136
        """'bzr merge' alone does not propagate tags to a master branch.
137
137
 
138
 
        This is so that 'bzr merge && bzr revert' will have no effect on the
139
 
        master branch.  (If the user runs 'bzr commit', then that is when the
140
 
        tags from the merge are propagated.)
 
138
        (If the user runs 'bzr commit', then that is when the tags from the
 
139
        merge are propagated.)
141
140
        """
142
141
        master, child = self.make_master_and_checkout()
143
142
        fork = self.make_fork(master)