← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Robert Collins
  • Date: 2005-08-25 12:46:42 UTC
  • mfrom: (1116)
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825124642-45ed1cd74db10370
merge from mpool

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