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

Multiple merges:
 * push should work with branches without a working tree.
 * Knit pushes on SFTP are now much faster (removed a bad latency multiplier).
 * Reconciles at the end of fetch now skip non-dataloss issues. The command line
   reconcile will still check all data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
                                  "Reconciliation complete.\n" %
61
61
                                  t.bzrdir.root_transport.base)
62
62
        self.assertEqualDiff(err, "")
63