Rev 1541: Add push --overwrite blackbox test. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1541
revision-id: jelmer at samba.org-20080802232823-czbuj7b01av6e21w
parent: jelmer at samba.org-20080802230339-3dczkpyap53305am
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-03 01:28:23 +0200
message:
  Add push --overwrite blackbox test.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
=== modified file 'branch.py'
--- a/branch.py	2008-08-02 23:03:39 +0000
+++ b/branch.py	2008-08-02 23:28:23 +0000
@@ -500,9 +500,9 @@
             todo = self.otherline_missing_revisions(other, stop_revision, overwrite)
         if todo is None:
             raise DivergedBranches(self, other)
-        self._push_missing_revisions(todo)
+        self._push_missing_revisions(other, todo)
 
-    def _push_missing_revisions(self, todo):
+    def _push_missing_revisions(self, other, todo):
         pb = ui.ui_factory.nested_progress_bar()
         try:
             for revid in todo:

=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py	2008-07-09 01:49:41 +0000
+++ b/tests/test_blackbox.py	2008-08-02 23:28:23 +0000
@@ -60,6 +60,21 @@
         self.run_bzr("push -d dc %s" % repos_url)
         self.check_output("", "status dc")
 
+    def test_push_overwrite(self):
+        repos_url = self.make_repository('d')
+        
+        dc = self.get_commit_editor(repos_url)
+        trunk = dc.add_dir('trunk')
+        trunk.add_file("trunk/foo").modify()
+        dc.close()
+
+        self.run_bzr("init dc")
+        self.build_tree({"dc/bar": "blaaaa"})
+        self.run_bzr("add dc/bar")
+        self.run_bzr("commit -m msg dc")
+        self.run_bzr("push --overwrite -d dc %s/trunk" % repos_url)
+        self.check_output("", "status dc")
+
     def test_dpush(self):
         repos_url = self.make_repository('d')