@@ -147,6 +147,10 @@ def test_index_file_from_tree(self):
147147
148148 @with_rw_repo ('0.1.6' )
149149 def test_index_merge_tree (self , rw_repo ):
150+ # A bit out of place, but we need a different repo for this:
151+ assert self .rorepo != rw_repo and not (self .rorepo == rw_repo )
152+ assert len (set ((self .rorepo , self .rorepo , rw_repo , rw_repo ))) == 2
153+
150154 # SINGLE TREE MERGE
151155 # current index is at the (virtual) cur_commit
152156 next_commit = "4c39f9da792792d4e73fc3a5effde66576ae128c"
@@ -546,10 +550,10 @@ def make_paths():
546550 yield index .entries [index .get_entries_key ('.gitignore' , 0 )]
547551
548552 for fid in range (3 ):
549- fname = 'newfile%i' % fid
550- open (fname , 'wb' ).write ("abcd" )
551- yield Blob (rw_repo , Blob .NULL_HEX_SHA , 0100644 , fname )
552- # END for each new file
553+ fname = 'newfile%i' % fid
554+ open (fname , 'wb' ).write ("abcd" )
555+ yield Blob (rw_repo , Blob .NULL_HEX_SHA , 0100644 , fname )
556+ # END for each new file
553557 # END path producer
554558 paths = list (make_paths ())
555559 index .add (paths , path_rewriter = rewriter )
0 commit comments