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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-13 12:09:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171113120954-qk5p1jcx3zcmf4rr
Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
2327
2327
        wt.commit('C', rev_id='C-id')
2328
2328
        wt.merge_from_branch(wt.branch, 'B-id')
2329
2329
        self.assertEqual('barry', wt.id2path('foo-id'))
2330
 
        self.assertEqual('bar', wt.get_symlink_target('foo'))
 
2330
        self.assertEqual('bar', wt.get_symlink_target('barry'))
2331
2331
        wt.commit('E merges C & B', rev_id='E-id')
2332
2332
        wt.rename_one('barry', 'blah')
2333
2333
        wt.commit('F barry => blah', rev_id='F-id')