Rev 443: Add test for bug #91641 in sftp://people.samba.org/~/bzr/bzr-svn/0.3/

[Jelmer Vernooij]

At sftp://people.samba.org/~/bzr/bzr-svn/0.3/

------------------------------------------------------------
revno: 443
revision-id: jelmer at samba.org-20070408012744-947rmcugvtga8ld8
parent: jelmer at samba.org-20070403203246-0tnykd16qpi4uy3n
parent: mwh at quickbeam-20070407224317-ltv1d3qhujm9pypi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-04-08 03:27:44 +0200
message:
  Add test for bug #91641
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
    ------------------------------------------------------------
    revno: 421.1.1
    merged: mwh at quickbeam-20070407224317-ltv1d3qhujm9pypi
    parent: jelmer at samba.org-20070311232925-2nc3xpxxmoftgbyi
    committer: Michael Hudson <mwh at quickbeam>
    branch nick: bzrsvn
    timestamp: Sat 2007-04-07 23:43:17 +0100
    message:
      failing test
=== modified file 'NEWS'
--- a/NEWS	2007-04-03 20:32:46 +0000
+++ b/NEWS	2007-04-08 01:27:44 +0000
@@ -2,7 +2,7 @@
 
   IMPROVEMENTS
 
-  * Don't do extra checkout before push if possible. (#91885)
+  * Don't do extra checkout before push if possible. (#91885, #91641)
 
   * Set parent URLs in svn-import. (#94406)
 

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2007-03-25 14:41:44 +0000
+++ b/tests/test_commit.py	2007-04-08 01:27:44 +0000
@@ -91,6 +91,42 @@
         self.assertEqual("some-ghost-revision\n", 
                 self.client_get_prop(repos_url, "bzr:merge", 1))
 
+    def test_mwh(self):
+        repo = self.make_client('d', 'sc')
+        def mv(*mvs):
+            for a, b in mvs:
+                self.client_copy(a, b)
+                self.client_delete(a)
+            self.client_commit('sc', '.')
+            self.client_update('sc')
+        self.build_tree({'sc/de/foo':'data', 'sc/de/bar':'DATA'})
+        self.client_add('sc/de')
+        self.client_commit('sc', 'blah')
+        self.client_update('sc')
+        os.mkdir('sc/de/trunk')
+        self.client_add('sc/de/trunk')
+        mv(('sc/de/foo', 'sc/de/trunk'), ('sc/de/bar', 'sc/de/trunk'))
+        mv(('sc/de', 'sc/pyd')) 
+        self.client_delete('sc/pyd/trunk/foo')
+        self.client_commit('sc', '.')
+        self.client_update('sc')
+
+        self.make_checkout(repo + '/pyd/trunk', 'pyd')
+        assert open('pyd/bar').read() == 'DATA'
+
+        olddir = BzrDir.open("pyd")
+        os.mkdir('bc')
+        newdir = olddir.sprout("bc")
+        newdir.open_branch().pull(olddir.open_branch())
+        wt = newdir.open_workingtree()
+        assert open('bc/bar').read() == 'DATA'
+        open('bc/bar', 'w').write('data')
+        wt.commit(message="Commit from Bzr")
+        olddir.open_branch().pull(newdir.open_branch())
+
+        self.client_update('pyd')
+        assert open('pyd/bar').read() == 'data'
+        
 
 class TestPush(TestCaseWithSubversionRepository):
     def setUp(self):