comparison tests/test_single_dir_clone.py @ 868:cc1c870f1758

test_util: pass repo_path to _add_svn_rev() explicitely
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 18:29:29 +0200
parents 20e73b5ab6f7
children db3a651494f9
comparison
equal deleted inserted replaced
867:50c13e01c7e3 868:cc1c870f1758
150 def test_push_single_dir_one_incoming_and_two_outgoing(self): 150 def test_push_single_dir_one_incoming_and_two_outgoing(self):
151 # Tests simple pushing from default branch to a single dir repo 151 # Tests simple pushing from default branch to a single dir repo
152 # Pushes two outgoing over one incoming svn rev 152 # Pushes two outgoing over one incoming svn rev
153 # (used to cause an "unknown revision") 153 # (used to cause an "unknown revision")
154 # This can happen if someone committed to svn since our last pull (race). 154 # This can happen if someone committed to svn since our last pull (race).
155 repo = self._load_fixture_and_fetch('branch_from_tag.svndump', 155 repo, repo_path = self.load_and_fetch('branch_from_tag.svndump',
156 stupid=False, 156 stupid=False,
157 layout='single', 157 layout='single',
158 subdir='trunk') 158 subdir='trunk')
159 self._add_svn_rev({'trunk/alpha': 'Changed'}) 159 self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
160 def file_callback(repo, memctx, path): 160 def file_callback(repo, memctx, path):
161 return context.memfilectx(path=path, 161 return context.memfilectx(path=path,
162 data='data of %s' % path, 162 data='data of %s' % path,
163 islink=False, 163 islink=False,
164 isexec=False, 164 isexec=False,