← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
https://launchpad.net/bugs/177390
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
46
46
            does_backup_text = "Inventory ok.\n"
47
47
        else:
48
48
            does_backup_text = ""
49
 
        self.assertEqualDiff(out, "Reconciling branch %s\n"
50
 
                                  "revision_history ok.\n"
51
 
                                  "Reconciling repository %s\n"
 
49
        self.assertEqualDiff(out, "Reconciling repository %s\n"
52
50
                                  "%s"
53
51
                                  "Reconciliation complete.\n" %
54
 
                                  (t.branch.base,
55
 
                                   t.bzrdir.root_transport.base,
 
52
                                  (t.bzrdir.root_transport.base,
56
53
                                   does_backup_text))
57
54
        self.assertEqualDiff(err, "")
58
55
 
74
71
                "Inventory regenerated.\n")
75
72
        else:
76
73
            does_backup_text = ""
77
 
        expected = ("Reconciling branch %s\n"
78
 
                    "revision_history ok.\n"
79
 
                    "Reconciling repository %s\n"
 
74
        expected = ("Reconciling repository %s\n"
80
75
                    "%s"
81
76
                    "Reconciliation complete.\n" %
82
 
                    (t.branch.base,
83
 
                     t.bzrdir.root_transport.base,
84
 
                     does_backup_text))
 
77
                    (t.bzrdir.root_transport.base, does_backup_text))
85
78
        self.assertEqualDiff(expected, out)
86
79
        self.assertEqualDiff(err, "")