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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-10-26 08:43:44 UTC
  • mfrom: (5514.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101026084344-fip1ktaqjin2w720
(vila) Correctly set the Content-Type header when POSTing http
        requests (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
393
393
    def test_directive_cherrypick(self):
394
394
        source = self.make_branch_and_tree('source')
395
395
        source.commit("nothing")
396
 
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
 
396
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
397
397
        # cherrypick from one branch into another unrelated branch with a
398
398
        # different root id will give shape conflicts.  as a workaround we
399
399
        # make sure they share the same root id.