/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 breezy/git/tests/test_blackbox.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
17
17
 
18
18
"""Black-box tests for bzr-git."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
from dulwich.repo import (
21
23
    Repo as GitRepo,
22
24
    )
175
177
            error,
176
178
            'Pushed up to revision id git(.*).\n')
177
179
 
178
 
    def test_merge(self):
179
 
        self.run_bzr(['init', '--git', 'orig'])
180
 
        self.build_tree_contents([('orig/a', 'orig contents\n')])
181
 
        self.run_bzr(['add', 'orig/a'])
182
 
        self.run_bzr(['commit', '-m', 'add orig', 'orig'])
183
 
        self.run_bzr(['clone', 'orig', 'other'])
184
 
        self.build_tree_contents([('other/a', 'new contents\n')])
185
 
        self.run_bzr(['commit', '-m', 'modify', 'other'])
186
 
        self.build_tree_contents([('orig/b', 'more\n')])
187
 
        self.run_bzr(['add', 'orig/b'])
188
 
        self.build_tree_contents([('orig/a', 'new contents\n')])
189
 
        self.run_bzr(['commit', '-m', 'more', 'orig'])
190
 
        self.run_bzr(['merge', '-d', 'orig', 'other'])
191
 
 
192
180
    def test_push_lossy_non_mainline(self):
193
181
        self.run_bzr(['init', '--git', 'bla'])
194
182
        self.run_bzr(['init', 'foo'])