equal
deleted
inserted
replaced
476 fla = fca.flags() |
476 fla = fca.flags() |
477 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
477 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
478 if fca.node() == nullid and flags != flo: |
478 if fca.node() == nullid and flags != flo: |
479 if preresolve: |
479 if preresolve: |
480 self._repo.ui.warn( |
480 self._repo.ui.warn( |
481 _('warning: cannot merge flags for %s\n') % afile) |
481 _('warning: cannot merge flags for %s ' |
|
482 'without common ancestor - keeping local flags\n') |
|
483 % afile) |
482 elif flags == fla: |
484 elif flags == fla: |
483 flags = flo |
485 flags = flo |
484 if preresolve: |
486 if preresolve: |
485 # restore local |
487 # restore local |
486 if hash != nullhex: |
488 if hash != nullhex: |