diff tests/test_pull.py @ 1171:c55b94dc3a48

Merge with stable.
author Augie Fackler <raf@durin42.com>
date Fri, 04 Apr 2014 21:28:42 -0400
parents 61d4fb78370b
children 74e82a7da393
line wrap: on
line diff
--- a/tests/test_pull.py
+++ b/tests/test_pull.py
@@ -60,6 +60,13 @@ class TestPull(test_util.TestBase):
         commands.pull(repo.ui, repo)
         self.assertEqual(oldheads, map(node.hex, repo.heads()))
 
+    def test_pull_with_secret_default(self):
+        repo = self._loadupdate('branchtagcollision.svndump',
+                                config={'phases.new-commit': 'secret'})[0]
+        oldheads = map(node.hex, repo.heads())
+        commands.pull(repo.ui, repo)
+        self.assertEqual(oldheads, map(node.hex, repo.heads()))
+
     def test_skip_basic(self):
         repo, repo_path = self._loadupdate('single_rev.svndump')
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})