/breezy/3.0

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/3.0

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-06 00:18:25 UTC
  • mfrom: (6947.2.1 merge-modified)
  • Revision ID: breezy.the.bot@gmail.com-20180506001825-39izi7tauf7lu8w5
Don't expect unmodified files to be removed when a merge is reverted on working trees that don't support merge_modified.

Merged from https://code.launchpad.net/~jelmer/brz/merge-modified/+merge/345133

Show diffs side-by-side

added added

removed removed

Lines of Context:
631
631
        this.revert()
632
632
        self.assertFileEqual('a test\n', 'b1/a')
633
633
        self.assertPathExists('b1/b.~1~')
634
 
        self.assertPathDoesNotExist('b1/c')
635
 
        self.assertPathDoesNotExist('b1/a.~1~')
 
634
        if this.supports_merge_modified():
 
635
            self.assertPathDoesNotExist('b1/c')
 
636
            self.assertPathDoesNotExist('b1/a.~1~')
 
637
        else:
 
638
            self.assertPathExists('b1/c')
 
639
            self.assertPathExists('b1/a.~1~')
636
640
        self.assertPathExists('b1/d')
637
641
 
638
642
    def test_update_updates_bound_branch_no_local_commits(self):