equal
deleted
inserted
replaced
292 commononly=usecommon) |
292 commononly=usecommon) |
293 common, incoming, rheads = tmp |
293 common, incoming, rheads = tmp |
294 if not incoming: |
294 if not incoming: |
295 try: |
295 try: |
296 os.unlink(bundlename) |
296 os.unlink(bundlename) |
297 except: |
297 except OSError: |
298 pass |
298 pass |
299 return other, None, None, None |
299 return other, None, None, None |
300 |
300 |
301 bundle = None |
301 bundle = None |
302 if bundlename or not other.local(): |
302 if bundlename or not other.local(): |