equal
deleted
inserted
replaced
161 if sharedrepo and sharedfeatures > set(['journal']): |
161 if sharedrepo and sharedfeatures > set(['journal']): |
162 # there is a shared repository and there are shared journal entries |
162 # there is a shared repository and there are shared journal entries |
163 # to copy. move shared date over from source to destination but |
163 # to copy. move shared date over from source to destination but |
164 # move the local file first |
164 # move the local file first |
165 if repo.vfs.exists('namejournal'): |
165 if repo.vfs.exists('namejournal'): |
166 journalpath = repo.join('namejournal') |
166 journalpath = repo.vfs.join('namejournal') |
167 util.rename(journalpath, journalpath + '.bak') |
167 util.rename(journalpath, journalpath + '.bak') |
168 storage = repo.journal |
168 storage = repo.journal |
169 local = storage._open( |
169 local = storage._open( |
170 repo.vfs, filename='namejournal.bak', _newestfirst=False) |
170 repo.vfs, filename='namejournal.bak', _newestfirst=False) |
171 shared = ( |
171 shared = ( |