← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1418
1418
            from bzrlib.testament import Testament
1419
1419
            # monkey patch gpg signing mechanism
1420
1420
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1421
 
            new_config = test_commit.MustSignConfig(branch)
 
1421
            new_config = test_commit.MustSignConfig()
1422
1422
            commit.Commit(config_stack=new_config).commit(message="base",
1423
1423
                                                    allow_pointless=True,
1424
1424
                                                    rev_id='B',