← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Martin Pool
  • Date: 2005-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
29
29
import sys
30
30
from bzrlib.selftest import InTempDir, BzrTestBase
31
31
 
32
 
 
33
32
class ExternalBase(InTempDir):
34
33
 
35
34
    def runbzr(self, args, retcode=0,backtick=False):
199
198
 
200
199
    def test_merge(self):
201
200
        from bzrlib.branch import Branch
 
201
        from bzrlib.commands import run_bzr
202
202
        import os
 
203
        
203
204
        os.mkdir('a')
204
205
        os.chdir('a')
 
206
 
205
207
        self.example_branch()
206
208
        os.chdir('..')
207
209
        self.runbzr('branch a b')
220
222
        a = Branch('.')
221
223
        b = Branch('../b')
222
224
        a.get_revision_xml(b.last_patch())
223
 
        print "Pending: %s" % a.pending_merges()
 
225
 
 
226
        self.log('pending merges: %s', a.pending_merges())
224
227
#        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
225
228
#        % (a.pending_merges(), b.last_patch())
226
229