Rev 459: Add test for DivergedBranches being raised. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

------------------------------------------------------------
revno: 459
revision-id: jelmer at samba.org-20070521004738-tm3gl0111564pd31
parent: jelmer at samba.org-20070520213233-3d1gn6gogpsapnpc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-05-21 01:47:38 +0100
message:
  Add test for DivergedBranches being raised.
modified:
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2007-05-19 00:12:08 +0000
+++ b/tests/test_push.py	2007-05-21 00:47:38 +0000
@@ -249,3 +249,19 @@
                 wt.branch.repository.get_ancestry(wt.branch.last_revision()), 
                 repos.get_ancestry(wt.branch.last_revision()))
 
+    def test_multiple_diverged(self):
+        oc_url = self.make_client("o", "oc")
+
+        self.build_tree({'dc/file': 'data'})
+        wt = self.bzrdir.open_workingtree()
+        wt.add('file')
+        wt.commit(message="Commit from Bzr")
+
+        self.build_tree({'oc/file': 'data2', 'oc/adir': None})
+        self.client_add("oc/file")
+        self.client_add("oc/adir")
+        self.client_commit("oc", "Another commit from Bzr")
+
+        self.assertRaises(DivergedBranches, 
+                lambda: Branch.open(oc_url).pull(self.bzrdir.open_branch()))
+