Mercurial > hgsubversion

comparison tests/test_single_dir_push.py @ 1346:538bbb927609

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 Tue, 11 Aug 2015 17:07:59 -0400
parents e597714cb420
children 0ebcc5bbf692
comparison
equal deleted inserted replaced
1341:7e10891666fe 1346:538bbb927609
156 self.pushrevisions() 156 self.pushrevisions()
157 repo = self.repo # repo is outdated after the rebase happens, refresh 157 repo = self.repo # repo is outdated after the rebase happens, refresh
158 self.assertTrue('foo' in test_util.svnls(repo_path, '')) 158 self.assertTrue('foo' in test_util.svnls(repo_path, ''))
159 self.assertEqual(compathacks.branchset(repo), set(['default'])) 159 self.assertEqual(compathacks.branchset(repo), set(['default']))
160 # Have to cross to another branch head, so hg.update doesn't work 160 # Have to cross to another branch head, so hg.update doesn't work
161 commands.update(ui.ui(), 161 commands.update(self.ui(),
162 self.repo, 162 self.repo,
163 self.repo.branchheads('default')[1], 163 self.repo.branchheads('default')[1],
164 clean=True) 164 clean=True)
165 self.pushrevisions() 165 self.pushrevisions()
166 self.assertTrue('default' in test_util.svnls(repo_path, '')) 166 self.assertTrue('default' in test_util.svnls(repo_path, ''))
169 @test_util.requiresoption('branch') 169 @test_util.requiresoption('branch')
170 def test_push_single_dir_renamed_branch(self): 170 def test_push_single_dir_renamed_branch(self):
171 # Tests pulling and pushing with a renamed branch 171 # Tests pulling and pushing with a renamed branch
172 # Based on test_push_single_dir 172 # Based on test_push_single_dir
173 repo_path = self.load_svndump('branch_from_tag.svndump') 173 repo_path = self.load_svndump('branch_from_tag.svndump')
174 cmd = ['clone', '--layout=single', '--branch=flaf'] 174 cmd = ['clone', '--quiet', '--layout=single', '--branch=flaf']
175 if self.stupid: 175 if self.stupid:
176 cmd.append('--stupid') 176 cmd.append('--stupid')
177 cmd += [test_util.fileurl(repo_path), self.wc_path] 177 cmd += [test_util.fileurl(repo_path), self.wc_path]
178 test_util.dispatch(cmd) 178 test_util.dispatch(cmd)
179 179