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

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
122
122
        self.assertFileEqual("# comment\n"
123
123
                             "[%s]\n"
124
124
                             "push_location = foo\n"
125
 
                             "push_location:policy = norecurse" % local_path,
 
125
                             "push_location:policy = norecurse\n" % local_path,
126
126
                             fn)
127
127
 
128
128
    # TODO RBC 20051029 test getting a push location from a branch in a