Rev 4035: Use the same logic push does to avoid tags operations when pushing new branches. in http://people.ubuntu.com/~robertc/baz2.0/push.roundtrips

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/push.roundtrips

------------------------------------------------------------
revno: 4035
revision-id: robertc at robertcollins.net-20090224060501-u2qq414byirhfggj
parent: robertc at robertcollins.net-20090224053717-sau62hnxgo2f1pzr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Tue 2009-02-24 17:05:01 +1100
message:
  Use the same logic push does to avoid tags operations when pushing new branches.
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2009-02-24 05:37:17 +0000
+++ b/bzrlib/branch.py	2009-02-24 06:05:01 +0000
@@ -973,7 +973,8 @@
         else:
             if parent:
                 destination.set_parent(parent)
-        self.tags.merge_to(destination.tags)
+        if self._push_should_merge_tags():
+            self.tags.merge_to(destination.tags)
 
     @needs_read_lock
     def check(self):

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2009-02-24 05:37:17 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2009-02-24 06:05:01 +0000
@@ -202,7 +202,7 @@
         # being too low. If rpc_count increases, more network roundtrips have
         # become necessary for this use case. Please do not adjust this number
         # upwards without agreement from bzr's network support maintainers.
-        self.assertEqual(40, rpc_count)
+        self.assertEqual(36, rpc_count)
 
     def test_push_smart_stacked_streaming_acceptance(self):
         self.setup_smart_server_with_call_log()