Mercurial > hgsubversion

comparison tests/test_pull.py @ 1171:c55b94dc3a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Fri, 04 Apr 2014 21:28:42 -0400
parents 61d4fb78370b
children 74e82a7da393
comparison
equal deleted inserted replaced
1169:8be519003868 1171:c55b94dc3a48
58 repo = self._loadupdate('branchtagcollision.svndump')[0] 58 repo = self._loadupdate('branchtagcollision.svndump')[0]
59 oldheads = map(node.hex, repo.heads()) 59 oldheads = map(node.hex, repo.heads())
60 commands.pull(repo.ui, repo) 60 commands.pull(repo.ui, repo)
61 self.assertEqual(oldheads, map(node.hex, repo.heads())) 61 self.assertEqual(oldheads, map(node.hex, repo.heads()))
62 62
63 def test_pull_with_secret_default(self):
64 repo = self._loadupdate('branchtagcollision.svndump',
65 config={'phases.new-commit': 'secret'})[0]
66 oldheads = map(node.hex, repo.heads())
67 commands.pull(repo.ui, repo)
68 self.assertEqual(oldheads, map(node.hex, repo.heads()))
69
63 def test_skip_basic(self): 70 def test_skip_basic(self):
64 repo, repo_path = self._loadupdate('single_rev.svndump') 71 repo, repo_path = self._loadupdate('single_rev.svndump')
65 self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'}) 72 self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
66 self.add_svn_rev(repo_path, {'trunk/beta': 'More changed'}) 73 self.add_svn_rev(repo_path, {'trunk/beta': 'More changed'})
67 self.add_svn_rev(repo_path, {'trunk/gamma': 'Even more changeder'}) 74 self.add_svn_rev(repo_path, {'trunk/gamma': 'Even more changeder'})