/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/tests/blackbox/test_update.py

  • Committer: Martin
  • Date: 2017-11-12 13:53:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6810.
  • Revision ID: gzlist@googlemail.com-20171112135351-uyr1ncw7visg62c2
Apply 2to3 ws_comma fixer

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_update.py
83
83
        self.run_bzr('add checkout/file')
84
84
        self.run_bzr('commit -m add-file checkout')
85
85
        # now branch should be out of date
86
 
        out,err = self.run_bzr('update branch')
 
86
        out, err = self.run_bzr('update branch')
87
87
        self.assertEqual('', out)
88
88
        self.assertEqualDiff("""+N  file
89
89
All changes applied successfully.
101
101
        self.run_bzr('add checkout/file')
102
102
        self.run_bzr('commit -m add-file checkout')
103
103
        # now checkout2 should be out of date
104
 
        out,err = self.run_bzr('update checkout2')
 
104
        out, err = self.run_bzr('update checkout2')
105
105
        self.assertEqualDiff('''+N  file
106
106
All changes applied successfully.
107
107
Updated to revision 1 of branch %s
127
127
        a_file = file('checkout2/file', 'wt')
128
128
        a_file.write('Bar')
129
129
        a_file.close()
130
 
        out,err = self.run_bzr('update checkout2', retcode=1)
 
130
        out, err = self.run_bzr('update checkout2', retcode=1)
131
131
        self.assertEqualDiff(''' M  file
132
132
Text conflict in file
133
133
1 conflicts encountered.
365
365
 
366
366
        tree=self.make_branch_and_tree('.')
367
367
 
368
 
        f = open('hello','wt')
 
368
        f = open('hello', 'wt')
369
369
        f.write('foo')
370
370
        f.close()
371
371
        tree.add('hello')
372
372
        tree.commit('fie')
373
373
 
374
 
        f = open('hello','wt')
 
374
        f = open('hello', 'wt')
375
375
        f.write('fee')
376
376
        f.close()
377
377
        tree.commit('fee')
378
378
 
379
379
        #tree.update() gives no such revision, so ...
380
 
        self.run_bzr(['update','-r1'])
 
380
        self.run_bzr(['update', '-r1'])
381
381
 
382
382
        #create conflict
383
 
        f = open('hello','wt')
 
383
        f = open('hello', 'wt')
384
384
        f.write('fie')
385
385
        f.close()
386
386
 
387
 
        out, err = self.run_bzr(['update','--show-base'],retcode=1)
 
387
        out, err = self.run_bzr(['update', '--show-base'], retcode=1)
388
388
 
389
389
        # check for conflict notification
390
390
        self.assertContainsString(err,