equal
deleted
inserted
replaced
473 fca = self._repo.filectx(afile, fileid=anode, changeid=actx) |
473 fca = self._repo.filectx(afile, fileid=anode, changeid=actx) |
474 # "premerge" x flags |
474 # "premerge" x flags |
475 flo = fco.flags() |
475 flo = fco.flags() |
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: |
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\n') % afile) |
482 elif flags == fla: |
482 elif flags == fla: |
483 flags = flo |
483 flags = flo |